Merge lp:~robert-ancell/lightdm/session-start-bugs into lp:lightdm

Proposed by Robert Ancell
Status: Merged
Merged at revision: 1950
Proposed branch: lp:~robert-ancell/lightdm/session-start-bugs
Merge into: lp:lightdm
Diff against target: 42 lines (+4/-4)
2 files modified
liblightdm-gobject/liblightdm-gobject-1.vapi (+1/-1)
src/seat.c (+3/-3)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/session-start-bugs
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+214640@code.launchpad.net

Commit message

Fix return value for Vala bindings to Greeter.start_session_sync, fix logging when failing to find session

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'liblightdm-gobject/liblightdm-gobject-1.vapi'
--- liblightdm-gobject/liblightdm-gobject-1.vapi 2012-10-01 01:58:44 +0000
+++ liblightdm-gobject/liblightdm-gobject-1.vapi 2014-04-08 00:33:44 +0000
@@ -47,7 +47,7 @@
47 public bool in_authentication { get; }47 public bool in_authentication { get; }
48 public bool is_authenticated { get; }48 public bool is_authenticated { get; }
49 public unowned string? authentication_user { get; }49 public unowned string? authentication_user { get; }
50 public void start_session_sync (string? session = null) throws GLib.Error;50 public bool start_session_sync (string? session = null) throws GLib.Error;
51 }51 }
52 [CCode (has_type_id = false)]52 [CCode (has_type_id = false)]
53 public enum MessageType {53 public enum MessageType {
5454
=== modified file 'src/seat.c'
--- src/seat.c 2014-03-17 18:45:29 +0000
+++ src/seat.c 2014-04-08 00:33:44 +0000
@@ -912,7 +912,7 @@
912 g_object_unref (session_config);912 g_object_unref (session_config);
913 }913 }
914 else914 else
915 l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));915 l_debug (seat, "Can't find session '%s'", session_name);
916916
917 g_object_unref (user);917 g_object_unref (user);
918918
@@ -953,7 +953,7 @@
953 g_free (sessions_dir);953 g_free (sessions_dir);
954 if (!session_config)954 if (!session_config)
955 {955 {
956 l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));956 l_debug (seat, "Can't find session '%s'", session_name);
957 return NULL;957 return NULL;
958 }958 }
959959
@@ -1044,7 +1044,7 @@
1044 g_free (sessions_dir);1044 g_free (sessions_dir);
1045 if (!session_config)1045 if (!session_config)
1046 {1046 {
1047 l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));1047 l_debug (seat, "Can't find session '%s'", session_name);
1048 return FALSE;1048 return FALSE;
1049 }1049 }
10501050

Subscribers

People subscribed via source and target branches