rpms/gdm/F-12 0001-Don-t-show-lock-screen-option-if-locked-down.patch, 1.1, 1.2 gdm.spec, 1.516, 1.517
Matthias Clasen
mclasen at fedoraproject.org
Sun Nov 1 00:51:46 UTC 2009
- Previous message: rpms/bluez/F-12 .cvsignore, 1.50, 1.51 bluez.spec, 1.102, 1.103 sources, 1.50, 1.51
- Next message: rpms/kdeplasma-addons/devel .cvsignore, 1.22, 1.23 kdeplasma-addons.spec, 1.70, 1.71 sources, 1.21, 1.22 kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14099
Modified Files:
0001-Don-t-show-lock-screen-option-if-locked-down.patch
gdm.spec
Log Message:
better patch
0001-Don-t-show-lock-screen-option-if-locked-down.patch:
applet.c | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
Index: 0001-Don-t-show-lock-screen-option-if-locked-down.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/0001-Don-t-show-lock-screen-option-if-locked-down.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Don-t-show-lock-screen-option-if-locked-down.patch 31 Oct 2009 23:43:22 -0000 1.1
+++ 0001-Don-t-show-lock-screen-option-if-locked-down.patch 1 Nov 2009 00:51:44 -0000 1.2
@@ -1,18 +1,6 @@
-From 8b03661e8fe3cb7ad2785c935fd0920f44d32138 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann at redhat.com>
-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
-
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -p -r1.516 -r1.517
--- gdm.spec 31 Oct 2009 23:43:22 -0000 1.516
+++ gdm.spec 1 Nov 2009 00:51:45 -0000 1.517
@@ -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 <mclasen at redhat.com> 2.28.1-19
+* Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-20
- Don't show 'Lock Screen' in the user switcher if locked down
* Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-18
- Previous message: rpms/bluez/F-12 .cvsignore, 1.50, 1.51 bluez.spec, 1.102, 1.103 sources, 1.50, 1.51
- Next message: rpms/kdeplasma-addons/devel .cvsignore, 1.22, 1.23 kdeplasma-addons.spec, 1.70, 1.71 sources, 1.21, 1.22 kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list