rpms/gnome-panel/devel power-management.patch, NONE, 1.1 gnome-panel.spec, 1.208, 1.209 gnome-panel-2.19.2-move-suspend-to-menu.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9985

Modified Files:
	gnome-panel.spec 
Added Files:
	power-management.patch 
Removed Files:
	gnome-panel-2.19.2-move-suspend-to-menu.patch 
Log Message:
fix panel power management


power-management.patch:

--- NEW FILE power-management.patch ---
diff -up gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management gnome-panel-2.19.5/gnome-panel/panel-power-manager.c
--- gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management	2007-07-25 17:55:32.000000000 -0400
+++ gnome-panel-2.19.5/gnome-panel/panel-power-manager.c	2007-07-25 17:55:37.000000000 -0400
@@ -129,7 +129,7 @@ panel_power_manager_on_name_owner_change
 	                                   const char        *new_owner,
 	                                   PanelPowerManager *manager)
 {
-	if (strcmp (name, "org.gnome.PowerManager") != 0)
+	if (strcmp (name, "org.freedesktop.PowerManagement") != 0)
 		return;
 
 	if (manager->priv->gpm_proxy != NULL) {
@@ -189,9 +189,9 @@ panel_power_manager_ensure_gpm_connectio
 		manager->priv->gpm_proxy =
 			dbus_g_proxy_new_for_name_owner (
 					manager->priv->dbus_connection,
-					"org.gnome.PowerManager",
-					"/org/gnome/PowerManager",
-					"org.gnome.PowerManager",
+					"org.freedesktop.PowerManagement",
+					"/org/freedesktop/PowerManagement",
+					"org.freedesktop.PowerManagement",
 					&connection_error);
 
 		if (manager->priv->gpm_proxy == NULL) {
@@ -324,7 +324,7 @@ panel_power_manager_can_suspend (PanelPo
 	}
 
 	can_suspend = FALSE;
-	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend",
+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
 				&error,
 				G_TYPE_INVALID,
 				G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
@@ -355,7 +355,7 @@ panel_power_manager_can_hibernate (Panel
 	}
 
 	can_hibernate = FALSE;
-	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate",
+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
 				&error,
 				G_TYPE_INVALID,
 				G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- gnome-panel.spec	25 Jul 2007 17:20:43 -0000	1.208
+++ gnome-panel.spec	25 Jul 2007 22:41:18 -0000	1.209
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.5
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -86,7 +86,6 @@
 Patch2: gnome-panel-2.17.91-about-fedora.patch
 Patch3: gnome-panel-2.13.5-switch-user.patch
 Patch4: gnome-panel-2.16.1-search.patch
-Patch5: gnome-panel-2.19.2-move-suspend-to-menu.patch
 # Drop this patch for now, it should have AT LEAST been moved
 # to an upstream bugzilla by now
 #Patch6: gnome-panel-2.16.0-compiz-support.patch
@@ -94,6 +93,8 @@
 Patch7: clock-timezones.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=459973
 Patch8: gnome-panel-2.19.5-launcher-tooltip.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=460400
+Patch9: power-management.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -124,10 +125,10 @@
 %patch2 -p1 -b .about-fedora
 %patch3 -p1 -b .switch-user
 %patch4 -p1 -b .search
-%patch5 -p1 -b .move-suspend-to-menu
 #%patch6 -p0 -b .compiz-support
 %patch7 -p1 -b .clock-timezones
 %patch8 -p1 -b .launcher-tooltip
+%patch9 -p1 -b .power-management
 
 . %{SOURCE4}
 
@@ -308,6 +309,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jul 25 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.5-5
+- Make the panel talk to gnome-power-manager again.
+- Drop the patch to add suspend to the menu, it was
+  rejected by upstream
+
 * Wed Jul 25 2007 Jesse Keating <jkeating at redhat.com> - 2.19.5-4
 - Rebuild for RH #249435
 


--- gnome-panel-2.19.2-move-suspend-to-menu.patch DELETED ---