← Back to team overview

lightdm-gtk-greeter-team team mailing list archive

[Merge] lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter into lp:lightdm-gtk-greeter

 

Olivier Martin has proposed merging lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter into lp:lightdm-gtk-greeter.

Requested reviews:
  LightDM Gtk+ Greeter Development Team (lightdm-gtk-greeter-team)

For more details, see:
https://code.launchpad.net/~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter/+merge/224784

set_session: Ensure menu_items is not NULL
-- 
https://code.launchpad.net/~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter/+merge/224784
Your team LightDM Gtk+ Greeter Development Team is requested to review the proposed merge of lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-null-menu_iter into lp:lightdm-gtk-greeter.
=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c	2014-06-09 15:49:08 +0000
+++ src/lightdm-gtk-greeter.c	2014-06-27 10:21:32 +0000
@@ -709,7 +709,9 @@
         }
         if (!menu_iter)
             menu_iter = menu_items;
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
+
+        if (menu_iter)
+	        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
     }
 
     g_free (current_session);


Follow ups