rpms/gnome-power-manager/devel gnome-power-manager-2.13.5.0.20060207-panel-integration.patch, NONE, 1.1 gnome-power-manager.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29806

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.13.5.0.20060207-panel-integration.patch 
Log Message:
- remove Hibernate and Suspend from menus as part of
  panel/g-p-m integration effort


gnome-power-manager-2.13.5.0.20060207-panel-integration.patch:
 gpm-tray-icon.c |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5.0.20060207-panel-integration.patch ---
--- gnome-power-manager-2.13.5.0.20060207/src/gpm-tray-icon.c.panel-integration	2006-02-13 03:47:26.000000000 -0500
+++ gnome-power-manager-2.13.5.0.20060207/src/gpm-tray-icon.c	2006-02-13 03:48:33.000000000 -0500
@@ -414,9 +414,6 @@
 	gtk_ui_manager_add_ui_from_string (tray->priv->ui_manager,
 					   "<ui>"
 					   "  <popup name=\"GpmTrayPopup\">"
-					   "    <menuitem action=\"TraySuspend\" />"
-					   "    <menuitem action=\"TrayHibernate\" />"
-					   "    <separator />"
 					   "    <menuitem action=\"TrayPreferences\" />"
 					   "    <separator />"
 					   "    <menuitem action=\"TrayHelp\" />"


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-power-manager.spec	11 Feb 2006 03:15:56 -0000	1.21
+++ gnome-power-manager.spec	13 Feb 2006 09:23:47 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5.0.20060207
-Release: 1.1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -23,6 +23,8 @@
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
+Patch0: gnome-power-manager-2.13.5.0.20060207-panel-integration.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
 displaying icons and handling user callbacks in an interactive GNOME session. 
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .panel-integration
 
 %build
 %configure --disable-scrollkeeper
@@ -79,6 +82,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Sun Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.5.0.20060207-2
+- remove Hibernate and Suspend from menus as part of
+  panel/g-p-m integration effort
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5.0.20060207-1.1
 - bump again for double-long bug on ppc(64)