rpms/gnome-power-manager/devel gnome-power-manager-2.25.91-dont-block-logout.patch, NONE, 1.1 gnome-power-manager.spec, 1.148, 1.149

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27276

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.25.91-dont-block-logout.patch 
Log Message:
* Fri Feb 27 2009 Richard Hughes  <rhughes at redhat.com> - 2.25.91-5
- Backport patch from svn to not block logout


gnome-power-manager-2.25.91-dont-block-logout.patch:

--- NEW FILE gnome-power-manager-2.25.91-dont-block-logout.patch ---
Index: src/gpm-main.c
===================================================================
--- src/gpm-main.c	(revision 3290)
+++ src/gpm-main.c	(revision 3291)
@@ -203,9 +203,12 @@
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                            GPM_DATA G_DIR_SEPARATOR_S "icons");
 
-	/* we have to register with the session as we are starting up with the panel */
+	/* optionally register with the session */
 	session = gpm_session_new ();
-	gpm_session_register_client (session, "gnome-power-manager", getenv ("DESKTOP_AUTOSTART_ID"));
+	if (FALSE) {
+		egg_warning ("register with the session requires logout handling");
+		gpm_session_register_client (session, "gnome-power-manager", getenv ("DESKTOP_AUTOSTART_ID"));
+	}
 
 	/* create a new gui object */
 	manager = gpm_manager_new ();



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- gnome-power-manager.spec	27 Feb 2009 17:02:10 -0000	1.148
+++ gnome-power-manager.spec	27 Feb 2009 17:13:06 -0000	1.149
@@ -4,13 +4,16 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.25.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
+# already upstream in SVN
+Patch1: gnome-power-manager-2.25.91-dont-block-logout.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -53,6 +56,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .block-logout
 
 %build
 %configure \
@@ -160,6 +164,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Fri Feb 27 2009 Richard Hughes  <rhughes at redhat.com> - 2.25.91-5
+- Backport patch from svn to not block logout
+
 * Fri Feb 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.91-4
 - Require PolicyKit-authentication-agent