Small nits from review

diff --git a/configure.ac b/configure.ac
index 0de08ad32450530100c3e6f2f72d32dbcaaaf6a9..306dd2bd57a08bbeea05b19e841b859d9fbdf15d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.10.1)
+AC_INIT(lightdm, 1.11.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])

diff --git a/debian/changelog b/debian/changelog
index c558ccf9b4a0de3d52de3ed482a0e591da82e717..814252e5e6b0a02f0dbfa9923bb0e266ec74545b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-lightdm (1.10.1-0ubuntu1) UNRELEASED; urgency=medium
+lightdm (1.11.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Add lightdm_greeter_set_resettable
 
- -- Michael Terry <mterry@ubuntu.com>  Wed, 23 Apr 2014 19:21:30 -0400
+ -- Michael Terry <mterry@ubuntu.com>  Mon, 28 Apr 2014 09:42:14 -0400
 
 lightdm (1.10.0-0ubuntu3) trusty; urgency=medium
 

diff --git a/debian/liblightdm-gobject-1-0.symbols b/debian/liblightdm-gobject-1-0.symbols
index 770e824edb650fe0837512bbbb059ba464242de7..20cbc9e46af7ae05a9235528e7179a5999256b05 100644 (file)
--- a/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@ -37,7 +37,7 @@ liblightdm-gobject-1.so.0 liblightdm-gobject-1-0 #MINVER#
  lightdm_greeter_new@Base 0.9.2
  lightdm_greeter_respond@Base 0.9.2
  lightdm_greeter_set_language@Base 0.9.8
- lightdm_greeter_set_resettable@Base 1.10.1
+ lightdm_greeter_set_resettable@Base 1.11.0
  lightdm_greeter_start_session_sync@Base 0.9.2
  lightdm_hibernate@Base 0.9.2
  lightdm_language_get_code@Base 0.9.2

diff --git a/src/greeter.c b/src/greeter.c
index 2fc06a7602bef083510ee3f1c13c2748895383c1..941b9eb2ce0661df6758199a155a8efba10b439d 100644 (file)
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -327,7 +327,8 @@ send_end_authentication (Greeter *greeter, guint32 sequence_number, const gchar
     write_message (greeter, message, offset); 
 }
 
-void greeter_idle (Greeter *greeter)
+void
+greeter_idle (Greeter *greeter)
 {
     guint8 message[MAX_MESSAGE_LENGTH];
     gsize offset = 0;
@@ -336,7 +337,8 @@ void greeter_idle (Greeter *greeter)
     write_message (greeter, message, offset);
 }
 
-void greeter_reset (Greeter *greeter)
+void
+greeter_reset (Greeter *greeter)
 {
     guint8 message[MAX_MESSAGE_LENGTH];
     gsize offset = 0;
@@ -881,7 +883,7 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data)
         g_free (username);
         break;
     case GREETER_MESSAGE_SET_RESETTABLE:
-        greeter->priv->resettable = (gboolean)read_int (greeter, &offset);
+        greeter->priv->resettable = read_int (greeter, &offset) != 0;
         break;
     default:
         l_warning (greeter, "Unknown message from greeter: %d", id);

diff --git a/src/seat.c b/src/seat.c
index a341b5cb4927e92d0c8c1c0c71637662adb690d2..4a0464699dcc040393bece915f52b80deceec6d3 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -469,7 +469,7 @@ find_greeter_session (Seat *seat)
 }
 
 static void
-reset_greeter_hints (Seat *seat, Greeter *greeter_session)
+set_greeter_hints (Seat *seat, Greeter *greeter_session)
 {
     greeter_clear_hints (greeter_session);    
     greeter_set_hint (greeter_session, "default-session", seat_get_string_property (seat, "user-session"));
@@ -490,7 +490,7 @@ switch_to_greeter_from_failed_session (Seat *seat, Session *session)
     if (greeter_session)
     {
         l_debug (seat, "Switching to existing greeter");
-        reset_greeter_hints (seat, greeter_session);
+        set_greeter_hints (seat, greeter_session);
         existing = TRUE;
     }
     else
@@ -1233,7 +1233,7 @@ create_greeter_session (Seat *seat)
 
     /* Set hints to greeter */
     greeter_set_allow_guest (greeter_session, seat_get_allow_guest (seat));
-    reset_greeter_hints (seat, greeter_session);
+    set_greeter_hints (seat, greeter_session);
 
     g_object_unref (session_config);
 
@@ -1395,7 +1395,7 @@ switch_authentication_complete_cb (Session *session, Seat *seat)
     if (greeter_session)
     {
         l_debug (seat, "Switching to existing greeter to authenticate session");
-        reset_greeter_hints (seat, greeter_session);
+        set_greeter_hints (seat, greeter_session);
         existing = TRUE;
     }
     else
@@ -1522,7 +1522,7 @@ seat_lock (Seat *seat, const gchar *username)
     if (greeter_session)
     {
         l_debug (seat, "Switching to existing greeter");
-        reset_greeter_hints (seat, greeter_session);
+        set_greeter_hints (seat, greeter_session);
         existing = TRUE;
     }
     else

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 86b5fb6c669da8ec824907e81efff45250eb3fc7..978fcb40365d314d624413eb0ebae2a0ea504f08 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -65,7 +65,7 @@ sigterm_cb (gpointer user_data)
 }
 
 static void
-print_hints (LightDMGreeter *greeter)
+notify_hints (LightDMGreeter *greeter)
 {
     if (lightdm_greeter_get_select_user_hint (greeter))
         status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, lightdm_greeter_get_select_user_hint (greeter));
@@ -93,7 +93,7 @@ static void
 reset_cb (LightDMGreeter *greeter)
 {
     status_notify ("%s RESET", greeter_id);
-    print_hints (greeter);
+    notify_hints (greeter);
 }
 
 static void
@@ -453,7 +453,7 @@ main (int argc, char **argv)
         g_signal_connect (greeter, "reset", G_CALLBACK (reset_cb), NULL);
     }
 
-    print_hints (greeter);
+    notify_hints (greeter);
 
     g_main_loop_run (loop);
 

diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
index 012940641f43ec903bbcdc955f989dda03ed9c1d..d352d21217282c4eeb394cd969ec0f2494538f1f 100755 (executable)
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -185,7 +185,7 @@ def request_cb (channel, condition):
 
     return True
 
-def print_hints (greeter):
+def notify_hints (greeter):
     if greeter.get_select_user_hint () is not None:
         status_notify ('%s SELECT-USER-HINT USERNAME=%s' % (greeter_id, greeter.get_select_user_hint ()))
     if greeter.get_select_guest_hint ():
@@ -281,7 +281,7 @@ def idle_cb (greeter):
     status_notify ('%s IDLE' % (greeter_id))
 def reset_cb (greeter):
     status_notify ('%s RESET' % (greeter_id))
-    print_hints (greeter)
+    notify_hints (greeter)
 resettable = False
 try:
     resettable = config.get_boolean ('test-greeter-config', 'resettable')
@@ -292,6 +292,6 @@ if resettable:
     LightDM.Greeter.get_instance ().connect ('idle', idle_cb)
     LightDM.Greeter.get_instance ().connect ('reset', reset_cb)
 
-print_hints (greeter)
+notify_hints (greeter)
 
 loop.run ()