rpms/rhythmbox/devel rhythmbox-0.11.2-make-gpm-plugin-work.patch, NONE, 1.1 rhythmbox.spec, 1.133, 1.134

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15863

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.2-make-gpm-plugin-work.patch 
Log Message:
* Tue Oct 09 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-8
- Add patch to make the gnome-power-manager plugin work again
  (GNOME #483721)


rhythmbox-0.11.2-make-gpm-plugin-work.patch:

--- NEW FILE rhythmbox-0.11.2-make-gpm-plugin-work.patch ---
diff --git a/plugins/power-manager/rb-power-manager-plugin.c b/plugins/power-manager/rb-power-manager-plugin.c
index 5a9334c..b53324d 100644
--- a/plugins/power-manager/rb-power-manager-plugin.c
+++ b/plugins/power-manager/rb-power-manager-plugin.c
@@ -110,24 +110,41 @@ create_dbus_proxy (RBGPMPlugin *plugin)
 		return TRUE;
 	}
 
+	/* try new name first */
 	plugin->proxy = dbus_g_proxy_new_for_name_owner (plugin->bus,
-						   "org.gnome.PowerManager",
-						   "/org/gnome/PowerManager",
-						   "org.gnome.PowerManager",
+						   "org.freedesktop.PowerManagement",
+						   "/org/freedesktop/PowerManagement/Inhibit",
+						   "org.freedesktop.PowerManagement.Inhibit",
 						   &error);
-	if (error != NULL) {
-		if (ignore_error (error) == FALSE) {
-			g_warning ("Failed to create dbus proxy for org.gnome.PowerManager: %s",
-				   error->message);
-		}
+	if (error != NULL && ignore_error (error) == FALSE) {
+		g_warning ("Failed to create dbus proxy for org.gnome.PowerManager: %s",
+			   error->message);
 		g_error_free (error);
 		return FALSE;
-	} else {
-		g_signal_connect_object (plugin->proxy,
-					 "destroy",
-					 G_CALLBACK (proxy_destroy_cb),
-					 plugin, 0);
+	} else if (error != NULL) {
+		g_error_free (error);
+		error = NULL;
+
+		/* fall back to original name */
+		plugin->proxy = dbus_g_proxy_new_for_name_owner (plugin->bus,
+							   "org.gnome.PowerManager",
+							   "/org/gnome/PowerManager",
+							   "org.gnome.PowerManager",
+							   &error);
+		if (error != NULL) {
+			if (ignore_error (error) == FALSE) {
+				g_warning ("Failed to create dbus proxy for org.gnome.PowerManager: %s",
+					   error->message);
+			}
+			g_error_free (error);
+			return FALSE;
+		}
 	}
+
+	g_signal_connect_object (plugin->proxy,
+				 "destroy",
+				 G_CALLBACK (proxy_destroy_cb),
+				 plugin, 0);
 	return TRUE;
 }
 
@@ -145,7 +162,8 @@ inhibit_cb (DBusGProxy *proxy,
 			       G_TYPE_INVALID);
 	if (error != NULL) {
 		if (!ignore_error (error)) {
-			g_warning ("Failed to invoke org.gnome.PowerManager.Inhibit: %s",
+			g_warning ("Failed to invoke %s.Inhibit: %s",
+				   dbus_g_proxy_get_interface (proxy),
 				   error->message);
 		} else {
 			rb_debug ("inhibit failed: %s", error->message);
@@ -198,7 +216,8 @@ uninhibit_cb (DBusGProxy *proxy,
 			       G_TYPE_INVALID);
 	if (error != NULL) {
 		if (!ignore_error (error)) {
-			g_warning ("Failed to invoke org.gnome.PowerManager.Inhibit: %s",
+			g_warning ("Failed to invoke %s.Inhibit: %s",
+				   dbus_g_proxy_get_interface (proxy),
 				   error->message);
 		} else {
 			rb_debug ("uninhibit failed: %s", error->message);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- rhythmbox.spec	2 Oct 2007 12:19:50 -0000	1.133
+++ rhythmbox.spec	9 Oct 2007 13:38:58 -0000	1.134
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -48,6 +48,7 @@
 Patch0: rhythmbox-coherence-media-store-fixes.patch
 Patch1: rhythmbox-upnp-assert.patch
 Patch2: rhythmbox-enable-stores.patch
+Patch3: rhythmbox-0.11.2-make-gpm-plugin-work.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -83,6 +84,7 @@
 pushd data/
 %patch2 -p0 -b .enable-stores
 popd
+%patch3 -p1 -b .gpm-new-dbus
 
 %build
 
@@ -193,6 +195,10 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Oct 09 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-8
+- Add patch to make the gnome-power-manager plugin work again
+  (GNOME #483721)
+
 * Tue Oct 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-7
 - Add upstream patch to make the Upnp media store work (GNOME #482548)