Merge lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Olivier Martin
Status: Merged
Merged at revision: 291
Proposed branch: lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 14 lines (+3/-1)
1 file modified
src/lightdm-gtk-greeter.c (+3/-1)
To merge this branch: bzr merge lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter
Reviewer Review Type Date Requested Status
LightDM Gtk+ Greeter Development Team Pending
Review via email: mp+224784@code.launchpad.net

Description of the change

set_session: Ensure menu_items is not NULL

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
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-06-09 15:49:08 +0000
3+++ src/lightdm-gtk-greeter.c 2014-06-27 10:21:32 +0000
4@@ -709,7 +709,9 @@
5 }
6 if (!menu_iter)
7 menu_iter = menu_items;
8- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
9+
10+ if (menu_iter)
11+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
12 }
13
14 g_free (current_session);

Subscribers

People subscribed via source and target branches