From 59063abd1d1d697af8c46082866f92e93c811ebc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Nov 01 2009 00:51:45 +0000 Subject: better patch --- diff --git a/0001-Don-t-show-lock-screen-option-if-locked-down.patch b/0001-Don-t-show-lock-screen-option-if-locked-down.patch index 44ec25c..e3b6d65 100644 --- a/0001-Don-t-show-lock-screen-option-if-locked-down.patch +++ b/0001-Don-t-show-lock-screen-option-if-locked-down.patch @@ -1,18 +1,6 @@ -From 8b03661e8fe3cb7ad2785c935fd0920f44d32138 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Wed, 28 Oct 2009 19:18:50 -0400 -Subject: [PATCH 01/12] Don't show lock screen option if locked down - -Also fix up some other silliness -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=599962 ---- - gui/user-switch-applet/applet.c | 30 ++++++++++++++++++++++++------ - 1 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c -index 66897c0..a72997b 100644 ---- a/gui/user-switch-applet/applet.c -+++ b/gui/user-switch-applet/applet.c +diff -up gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down gdm-2.28.1/gui/user-switch-applet/applet.c +--- gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down 2009-10-19 18:12:45.000000000 -0400 ++++ gdm-2.28.1/gui/user-switch-applet/applet.c 2009-10-31 19:57:21.700544070 -0400 @@ -44,7 +44,9 @@ #include "gdm-entry-menu-item.h" @@ -24,36 +12,50 @@ index 66897c0..a72997b 100644 typedef enum { GSM_PRESENCE_STATUS_AVAILABLE = 0, -@@ -1163,7 +1165,7 @@ create_sub_menu (GdmAppletData *adata) +@@ -1163,7 +1165,11 @@ create_sub_menu (GdmAppletData *adata) G_CALLBACK (menuitem_style_set_cb), adata); g_signal_connect (adata->lock_screen_item, "activate", G_CALLBACK (on_lock_screen_activate), adata); - gtk_widget_show (adata->lock_screen_item); -+ /* Only show if not locked down */ ++ if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { ++ gtk_widget_hide (adata->lock_screen_item); ++ } else { ++ gtk_widget_show (adata->lock_screen_item); ++ } adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), -@@ -1229,12 +1231,18 @@ client_notify_lockdown_func (GConfClient *client, +@@ -1174,7 +1180,7 @@ create_sub_menu (GdmAppletData *adata) + G_CALLBACK (menuitem_style_set_cb), adata); + g_signal_connect (adata->login_screen_item, "activate", + G_CALLBACK (on_login_screen_activate), adata); +- /* Only show switch user if there are other users */ ++ update_switch_user (adata); + + adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit...")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), +@@ -1229,11 +1235,17 @@ client_notify_lockdown_func (GConfClient return; } - if (strcmp (key, LOCKDOWN_KEY) == 0) { + if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { if (gconf_value_get_bool (value)) { - set_menu_visibility (adata, FALSE); +- set_menu_visibility (adata, FALSE); ++ gtk_widget_hide (adata->login_screen_item); } else { - set_menu_visibility (adata, TRUE); - } +- set_menu_visibility (adata, TRUE); ++ gtk_widget_show (adata->login_screen_item); ++ } + } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { + if (gconf_value_get_bool (value)) { + gtk_widget_hide (adata->lock_screen_item); + } else { + gtk_widget_show (adata->lock_screen_item); -+ } + } } } - -@@ -1430,7 +1438,7 @@ fill_applet (PanelApplet *applet) +@@ -1430,7 +1442,7 @@ fill_applet (PanelApplet *applet) /* Hide the admin context menu items if locked down or no cmd-line */ if (gconf_client_get_bool (adata->client, @@ -62,7 +64,7 @@ index 66897c0..a72997b 100644 NULL) || panel_applet_get_locked_down (applet)) { bonobo_ui_component_set_prop (popup_component, -@@ -1502,18 +1510,28 @@ fill_applet (PanelApplet *applet) +@@ -1502,14 +1514,19 @@ fill_applet (PanelApplet *applet) adata->manager = gdm_user_manager_ref_default (); setup_current_user (adata); @@ -84,15 +86,3 @@ index 66897c0..a72997b 100644 set_menu_visibility (adata, FALSE); } else { set_menu_visibility (adata, TRUE); - } -+ if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { -+ gtk_widget_hide (adata->lock_screen_item); -+ } else { -+ gtk_widget_show (adata->lock_screen_item); -+ } - - error = NULL; - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); --- -1.6.5.1 - diff --git a/gdm.spec b/gdm.spec index 1a3db62..e03c548 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.28.1 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -419,7 +419,7 @@ fi %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so %changelog -* Sat Oct 31 2009 Matthias Clasen 2.28.1-19 +* Sat Oct 31 2009 Matthias Clasen 2.28.1-20 - Don't show 'Lock Screen' in the user switcher if locked down * Sat Oct 31 2009 Matthias Clasen 2.28.1-18