diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-09-15 14:54:17 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-09-15 14:55:38 -0400 |
| commit | d8a75a806215cf95832de70da7fdb9c7592d697f (patch) | |
| tree | c591b21cddec1db4df8103450a4f6166c5f40e63 | |
| parent | 2526867806fdab667138ea9d9e5cbf245f43c02f (diff) | |
| download | gdm-d8a75a806215cf95832de70da7fdb9c7592d697f.tar.gz | |
Don't show shutdown options when not available
The logic for showing the shut down menu was a little
iffy before. This is apparently causing issues on solaris,
and probably elsewhere.
https://bugzilla.gnome.org/show_bug.cgi?id=624298
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-panel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index 3614a88e..69eeeda3 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -793,7 +793,7 @@ setup_panel (GdmGreeterPanel *panel) gtk_widget_show (panel->priv->hostname_label); } - if (panel->priv->display_is_local || get_show_restart_buttons (panel)) { + if (!panel->priv->display_is_local || get_show_restart_buttons (panel)) { GtkWidget *menu_item; GtkWidget *image; @@ -820,7 +820,7 @@ setup_panel (GdmGreeterPanel *panel) menu_item = gtk_menu_item_new_with_label ("Disconnect"); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - } else { + } else if (get_show_restart_buttons (panel)) { if (can_suspend ()) { menu_item = gtk_menu_item_new_with_label (_("Suspend")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); |