r14350 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/03-system-policy.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jan 29 08:49:53 2008
New Revision: 14350

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14350
Log:
* debian/patches/03-system-policy.patch
  - Make gnome-power-manager claim org.freedesktop.Policy.Power on the
    D-Bus system bus on startup. This ensures that gnome-power-manager,
    kpowersave and powersaved are not stepping on each other's toes and only
    one program is acting on power management events.

Added:
    desktop/unstable/gnome-power-manager/debian/patches/03-system-policy.patch
Modified:
    desktop/unstable/gnome-power-manager/debian/changelog

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=14350&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Tue Jan 29 08:49:53 2008
@@ -1,3 +1,13 @@
+gnome-power-manager (2.20.2-3) UNRELEASED; urgency=low
+
+  * debian/patches/03-system-policy.patch
+    - Make gnome-power-manager claim org.freedesktop.Policy.Power on the
+      D-Bus system bus on startup. This ensures that gnome-power-manager,
+      kpowersave and powersaved are not stepping on each other's toes and only
+      one program is acting on power management events.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 29 Jan 2008 09:00:50 +0100
+
 gnome-power-manager (2.20.2-2) unstable; urgency=low
 
   * 01-use-panel-logout.patch: use gnome-panel-logout if available

Added: desktop/unstable/gnome-power-manager/debian/patches/03-system-policy.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/03-system-policy.patch?rev=14350&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/03-system-policy.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/03-system-policy.patch Tue Jan 29 08:49:53 2008
@@ -1,0 +1,49 @@
+--- src/gpm-main.c.orig	2007-11-02 18:31:05.000000000 +0100
++++ src/gpm-main.c	2008-01-29 09:44:53.000000000 +0100
+@@ -147,6 +147,7 @@
+  	GnomeProgram *program;
+ 	char **debugoptions = NULL;
+ 	int i;
++	gint ret;
+ 
+ 	const GOptionEntry options[] = {
+ 		{ "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon,
+@@ -217,7 +218,7 @@
+ 
+ 	gpm_debug ("GNOME %s %s", GPM_NAME, VERSION);
+ 
+-if (0) {
++/* if (0) { */
+ 	/* check dbus connections, exit if not valid */
+ 	system_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+ 	if (error) {
+@@ -228,7 +229,7 @@
+ 			   "It is <b>strongly recommended</b> you reboot "
+ 			   "your computer after starting this service.");
+ 	}
+-}
++/* } */
+ 
+ 	session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ 	if (error) {
+@@ -257,6 +258,20 @@
+ 
+ 	loop = g_main_loop_new (NULL, FALSE);
+ 
++	ret = dbus_bus_request_name(dbus_g_connection_get_connection(system_connection),
++				    "org.freedesktop.Policy.Power",
++				    DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
++	switch (ret) {
++	case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
++		gpm_debug("Successfully acquired interface org.freedesktop.Policy.Power.");
++		break;
++	case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
++		printf("Queued for interface org.freedesktop.Policy.Power.");
++		break;
++	default:
++		break;
++	};
++
+ 	/* Only timeout and close the mainloop if we have specified it
+ 	 * on the command line */
+ 	if (timed_exit == TRUE) {