merge with trunk

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index 7969458b21e5c8d20ec1262c3f72cccf7176056c..70456b36f62ea39b9a1477a6a37571e276c3a263 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -1,8 +1,14 @@
+AM_V_MOC4 = $(am__v_MOC4_$(V))
+am__v_MOC4_ = $(am__v_MOC4_$(AM_DEFAULT_VERBOSITY))
+am__v_MOC4_0 = @echo "  MOC4  " $@;
 %_moc4.cpp: QLightDM/%.h
-       $(MOC4) $< -o $@
+       $(AM_V_MOC4) $(MOC4) $< -o $@
 
+AM_V_MOC5 = $(am__v_MOC5_$(V))
+am__v_MOC5_ = $(am__v_MOC5_$(AM_DEFAULT_VERBOSITY))
+am__v_MOC5_0 = @echo "  MOC5  " $@;
 %_moc5.cpp: QLightDM/%.h
-       $(MOC5) $< -o $@
+       $(AM_V_MOC5) $(MOC5) $< -o $@
 
 common_libadd = \
        -L$(top_builddir)/liblightdm-gobject \

diff --git a/src/lightdm.c b/src/lightdm.c
index de795df78e91c0003a56aff1462657f6bb8cecbb..db4406a152c45e3c1f4d6bdc4db9c03953ad0c96 100644 (file)
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -1120,7 +1120,10 @@ main (int argc, char **argv)
             g_object_unref (seat);
         }
         else
-            g_warning ("Failed to create default seat");
+        {
+            g_warning ("Failed to create default seat %s", type);
+            return EXIT_FAILURE;
+        }
     }
 
     display_manager_start (display_manager);

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index a018e96f038ccbb2d31d713701fb0a14028fb4c5..6dbbff1067149973f5b6be4236ebf9a2c185b40c 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -101,9 +101,9 @@ test_script_hook_LDADD = \
        $(GIO_UNIX_LIBS)
 
 test-qt4-greeter_moc4.cpp: test-qt-greeter.h
-       $(MOC4) $< -o $@
+       $(am__v_MOC4_$(V)) $(MOC4) $< -o $@
 test-qt5-greeter_moc5.cpp: test-qt-greeter.h
-       $(MOC5) $< -o $@
+       $(am__v_MOC5_$(V)) $(MOC5) $< -o $@
 common_qt_sources = test-qt-greeter.cpp test-qt-greeter.h status.c status.h
 test_qt4_greeter_SOURCES = $(common_qt_sources)
 test_qt5_greeter_SOURCES = $(common_qt_sources)