Bug#628032: gdm3: Disabling restart buttons via /apps/gdm/simple-greeter/disable_restart_buttons value does not take effect

[Salvatore Bonaccorso]

Package: gdm3
Version: 2.30.5-6squeeze2
Severity: normal
Tags: patch

Hi

Trying to disable the restart buttons in gdm3 via

/etc/gdm3/greeter.gconf-defaults 

for the key

/apps/gdm/simple-greeter/disable_restart_buttons 

does not work. For a reference see [1]. We are requiring this at our
workplace to disable shutdown/restarts via gdm for users.

 [1] http://mail.gnome.org/archives/gdm-list/2011-May/msg00019.html

This was also known to upstream [2,3].

 [2] https://bugzilla.gnome.org/show_bug.cgi?id=604250
 [3] https://bugzilla.gnome.org/show_bug.cgi?id=624298

which upstream fixed with commit
d8a75a806215cf95832de70da7fdb9c7592d697f (note the patch in the
bugreport #604250 itself was not quite right).

The attached patch is upstreams commit, and refreshed for current
version 2.30.5-6squeeze2 in squeeze and applies on top of all others
patches.

Could you consider applying it and also upload fix for next squeeze
point release?

Bests
Salvatore

-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
commit d8a75a806215cf95832de70da7fdb9c7592d697f
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Sep 15 14:54:17 2010 -0400

    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

--- a/gui/simple-greeter/gdm-greeter-panel.c
+++ b/gui/simple-greeter/gdm-greeter-panel.c
@@ -838,7 +838,7 @@
                 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;
 
@@ -869,7 +869,7 @@
                         menu_item = gtk_menu_item_new_with_label (_("Quit"));
                         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);