]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Improve logind log messages
authorRobert Ancell <robert.ancell@canonical.com>
Fri, 5 Sep 2014 02:41:54 +0000 (14:41 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Fri, 5 Sep 2014 02:41:54 +0000 (14:41 +1200)
src/lightdm.c

index 3193008b810044d0dd866f6a4f893bfb5c1b3d39..870ff8102db785559291940ad9ddadec7c3661d3 100644 (file)
@@ -68,6 +68,8 @@ typedef struct
 
 #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager"
 
+static gboolean update_login1_seat (Login1Seat *login1_seat);
+
 static void
 log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data)
 {
@@ -1013,8 +1015,6 @@ remove_login1_seat (Login1Seat *login1_seat)
         seat_stop (seat);
 }
 
-static gboolean update_login1_seat (Login1Seat *login1_seat);
-
 static void
 seat_stopped_cb (Seat *seat, Login1Seat *login1_seat)
 {
@@ -1057,16 +1057,20 @@ login1_can_graphical_changed_cb (Login1Seat *login1_seat)
 static void
 login1_service_seat_added_cb (Login1Service *service, Login1Seat *login1_seat)
 {
+    if (login1_seat_get_can_graphical (login1_seat))
+        g_debug ("Seat %s added from logind", login1_seat_get_id (login1_seat));
+    else
+        g_debug ("Seat %s added from logind without graphical output", login1_seat_get_id (login1_seat));
+
     g_signal_connect (login1_seat, "can-graphical-changed", G_CALLBACK (login1_can_graphical_changed_cb), NULL);
-    login1_can_graphical_changed_cb (login1_seat);
+    update_login1_seat (login1_seat);
 }
 
 static void
 login1_service_seat_removed_cb (Login1Service *service, Login1Seat *login1_seat)
 {
+    g_debug ("Seat %s removed from logind", login1_seat_get_id (login1_seat));
     g_signal_handlers_disconnect_matched (login1_seat, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, login1_can_graphical_changed_cb, NULL);
-
-    g_debug ("Seat removed from logind: %s", login1_seat_get_id (login1_seat));
     remove_login1_seat (login1_seat);
 }