rpms/gdm/F-8 gdm-2.20.1-suspend.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 gdm.spec, 1.312, 1.313

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2514

Modified Files:
	.cvsignore gdm.spec 
Added Files:
	gdm-2.20.1-suspend.patch 
Log Message:
- Add suspend patch from Philippe Troin <phil at fifi.org>
  (bug 387001)


gdm-2.20.1-suspend.patch:

--- NEW FILE gdm-2.20.1-suspend.patch ---
diff -ru gdm-2.20.1.orig/daemon/gdm.c gdm-2.20.1/daemon/gdm.c
--- gdm-2.20.1.orig/daemon/gdm.c	2007-11-28 21:25:22.000000000 -0800
+++ gdm-2.20.1/daemon/gdm.c	2007-11-28 19:17:45.000000000 -0800
@@ -2538,7 +2538,7 @@
 		gdm_info (_("Master suspending..."));
 
 		sysmenu = gdm_daemon_config_get_value_bool_per_display (GDM_KEY_SYSTEM_MENU, d->name);
-		if (sysmenu && gdm_daemon_config_get_value_string (GDM_KEY_SUSPEND) != NULL) {
+		if (sysmenu && gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) != NULL) {
 			suspend_machine ();
 		}
 	} else if (strncmp (msg, GDM_SOP_CHOSEN_THEME " ",
diff -ru gdm-2.20.1.orig/daemon/slave.c gdm-2.20.1/daemon/slave.c
--- gdm-2.20.1.orig/daemon/slave.c	2007-11-28 21:25:22.000000000 -0800
+++ gdm-2.20.1/daemon/slave.c	2007-11-28 19:13:22.000000000 -0800
@@ -5512,7 +5512,7 @@
 		case GDM_INTERRUPT_SUSPEND:
 			if (d->attached &&
 			    gdm_daemon_config_get_value_bool_per_display (GDM_KEY_SYSTEM_MENU, d->name) &&
-			    ! ve_string_empty (gdm_daemon_config_get_value_string (GDM_KEY_SUSPEND))) {
+			    ! ve_string_empty (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND))) {
 			    	gchar *msg = g_strdup_printf ("%s %ld", 
 							      GDM_SOP_SUSPEND_MACHINE,
 							      (long)getpid ());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-8/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	27 Nov 2007 06:31:16 -0000	1.58
+++ .cvsignore	30 Nov 2007 18:54:13 -0000	1.59
@@ -1 +1,2 @@
 gdm-2.20.2.tar.bz2
+fedora-faces-20070319.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-8/gdm.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- gdm.spec	27 Nov 2007 15:40:04 -0000	1.312
+++ gdm.spec	30 Nov 2007 18:54:13 -0000	1.313
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -66,7 +66,10 @@
 
 # hack around broken tcp wrappers support
 # FIXME need to file upstream and get fixed in 2.20
-patch44: gdm-2.18.4-tcp-wrappers.patch
+Patch44: gdm-2.18.4-tcp-wrappers.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=500362
+Patch45: gdm-2.20.1-suspend.patch
 
 Patch100: gdm-2.20.1-change-defaults.patch
 Patch101: stupid-bullets.patch
@@ -158,6 +161,7 @@
 %patch42 -p1 -b .allow-escape
 %patch43 -p1 -b .keymouselistener-segfault
 %patch44 -p1 -b .tcp-wrappers
+%patch45 -p1 -b .suspend
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
@@ -372,6 +376,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Nov 30 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.2-2
+- Add suspend patch from Philippe Troin <phil at fifi.org>
+  (bug 387001)
+
 * Tue Nov 27 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.2-1
 - Update to 2.20.2