rpms/gnome-power-manager/F-10 gpm-use-sm-dbus-rather-than-libgnome.patch, NONE, 1.1 gnome-power-manager.spec, 1.134, 1.135 default-privs.patch, 1.1, NONE gpm-fix-buttons.patch, 1.1, NONE

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gpm-use-sm-dbus-rather-than-libgnome.patch 
Removed Files:
	default-privs.patch gpm-fix-buttons.patch 
Log Message:
* Mon Nov 17 2008 Richard Hughes  <rhughes at redhat.com> - 2.24.2-1
- Update to 2.24.2
- Duplicate button presses should now be detected
- Drop upstreamed patches


gpm-use-sm-dbus-rather-than-libgnome.patch:

--- NEW FILE gpm-use-sm-dbus-rather-than-libgnome.patch ---
Index: src/gpm-manager.c
===================================================================
--- src/gpm-manager.c	(revision 3092)
+++ src/gpm-manager.c	(working copy)
@@ -79,6 +79,10 @@
 #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate))
 #define GPM_MANAGER_RECALL_DELAY		1000*10
 
+#define GPM_SESSION_MANAGER_SERVICE	"org.gnome.SessionManager"
+#define GPM_SESSION_MANAGER_INTERFACE	"org.gnome.SessionManager"
+#define GPM_SESSION_MANAGER_PATH	"/org/gnome/SessionManager"
+
 struct GpmManagerPrivate
 {
 	GpmAcAdapter		*ac_adapter;
@@ -416,6 +420,34 @@
 }
 
 /**
+ * gpm_manager_logout_interactive:
+ **/
+static gboolean
+gpm_manager_logout_interactive (GpmManager *manager)
+{
+	GError *error = NULL;
+	DBusGProxy *proxy;
+	DBusGConnection *connection;
+
+	/* get session connection */
+	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+	if (connection == NULL) {
+		egg_warning ("failed to do interactive shutdown: %s", error->message);
+		g_error_free (error);
+		return FALSE;
+	}
+
+	/* contact the session manager */
+	proxy = dbus_g_proxy_new_for_name (connection, GPM_SESSION_MANAGER_SERVICE,
+					   GPM_SESSION_MANAGER_PATH, GPM_SESSION_MANAGER_INTERFACE);
+
+	/* we have to use no reply, as the SM calls into g-p-m to get the can_suspend property */
+	dbus_g_proxy_call_no_reply (proxy, "Shutdown", G_TYPE_INVALID);
+	g_object_unref (proxy);
+	return TRUE;
+}
+
+/**
  * manager_policy_do:
  * @manager: This class instance
  * @policy: The policy that we should do, e.g. "suspend"
@@ -463,9 +495,7 @@
 	} else if (strcmp (action, ACTION_INTERACTIVE) == 0) {
 		gpm_info_explain_reason (manager->priv->info, GPM_EVENT_NOTIFICATION,
 					_("GNOME interactive logout."), reason);
-		gnome_client_request_save (gnome_master_client (),
-					   GNOME_SAVE_GLOBAL,
-					   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
+		gpm_manager_logout_interactive (manager);
 	} else {
 		egg_warning ("unknown action %s", action);
 	}


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-10/gnome-power-manager.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnome-power-manager.spec	31 Oct 2008 17:10:10 -0000	1.134
+++ gnome-power-manager.spec	17 Nov 2008 10:44:18 -0000	1.135
@@ -4,19 +4,16 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.24.1
-Release: 3%{?dist}
+Version: 2.24.2
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org/projects/gnome-power-manager/
 
-# Backported from trunk
-Patch0:    gpm-fix-buttons.patch
-
-# From upstream
-Patch1:    default-privs.patch
+# Backport SM code from trunk
+Patch0:    gpm-use-sm-dbus-rather-than-libgnome.patch
 
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
@@ -56,8 +53,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1 -b .default-privs
+%patch0 -p0 -b .use-sm
 
 %build
 %configure \
@@ -162,6 +158,11 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Nov 17 2008 Richard Hughes  <rhughes at redhat.com> - 2.24.2-1
+- Update to 2.24.2
+- Duplicate button presses should now be detected
+- Drop upstreamed patches
+
 * Fri Oct 31 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.1-3
 - Make "Make default" button work
 


--- default-privs.patch DELETED ---


--- gpm-fix-buttons.patch DELETED ---