Merge lp:~aacid/lightdm/remote-sessions-null-session-crash into lp:~robert-ancell/lightdm/remote-sessions

Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 1545
Proposed branch: lp:~aacid/lightdm/remote-sessions-null-session-crash
Merge into: lp:~robert-ancell/lightdm/remote-sessions
Diff against target: 19 lines (+3/-2)
1 file modified
liblightdm-gobject/session.c (+3/-2)
To merge this branch: bzr merge lp:~aacid/lightdm/remote-sessions-null-session-crash
Reviewer Review Type Date Requested Status
Robert Ancell Pending
Review via email: mp+121380@code.launchpad.net

Commit message

Do not insert null session into sessions

Makes it crash when sorting

Description of the change

Do not insert null session into sessions

Makes it crash when sorting

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'liblightdm-gobject/session.c'
--- liblightdm-gobject/session.c 2012-08-26 23:38:05 +0000
+++ liblightdm-gobject/session.c 2012-08-27 08:50:26 +0000
@@ -149,12 +149,13 @@
149 key = g_strndup (filename, strlen (filename) - strlen (".desktop"));149 key = g_strndup (filename, strlen (filename) - strlen (".desktop"));
150 session = load_session (key_file, key);150 session = load_session (key_file, key);
151 if (session)151 if (session)
152 {
152 g_debug ("Loaded session %s (%s, %s)", path, GET_PRIVATE (session)->name, GET_PRIVATE (session)->comment);153 g_debug ("Loaded session %s (%s, %s)", path, GET_PRIVATE (session)->name, GET_PRIVATE (session)->comment);
154 sessions = g_list_insert_sorted (sessions, session, compare_session);
155 }
153 else156 else
154 g_debug ("Ignoring session %s", path);157 g_debug ("Ignoring session %s", path);
155 g_free (key);158 g_free (key);
156
157 sessions = g_list_insert_sorted (sessions, session, compare_session);
158 }159 }
159160
160 g_free (path);161 g_free (path);

Subscribers

People subscribed via source and target branches