diff options
| author | Andrew P. <pan.pav.7c5@gmail.com> | 2014-07-05 13:01:43 +0300 |
|---|---|---|
| committer | Andrew P. <pan.pav.7c5@gmail.com> | 2014-07-05 13:01:43 +0300 |
| commit | b974b70efafe6a3ed4d4d0d1bd04073a11275488 (patch) | |
| tree | 6c6b081c4229637e76a7c1779de06cb9a071ba4c | |
| parent | 362585d096da136b8c3eb7073a0f5ccda7282304 (diff) | |
| parent | 87b24064644315444ad0a1f9afbd79e7537af1f2 (diff) | |
| download | lightdm-gtk-greeter-git-b974b70efafe6a3ed4d4d0d1bd04073a11275488.tar.gz | |
Merge "null-menu_iter" branch by olivier-martin
| -rw-r--r-- | src/lightdm-gtk-greeter.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 4a54f3b..e3df418 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -709,7 +709,9 @@ set_session (const gchar *session) } 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); @@ -785,7 +787,10 @@ set_language (const gchar *language) for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) { if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data))) + { gtk_menu_item_set_label(GTK_MENU_ITEM(language_menuitem), g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code"))); + break; + } } } } |