rpms/gnome-power-manager/devel gnome-power-manager-0.3.4-left-click.patch, NONE, 1.1 gnome-power-manager.spec, 1.13, 1.14

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 24 18:07:59 UTC 2006


Author: caillon

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-0.3.4-left-click.patch 
Log Message:
* Tue Jan 24 2006 Christopher Aillon <caillon at redhat.com> - 0.3.4-2
- Left clicking on the applet should bring up the menu


gnome-power-manager-0.3.4-left-click.patch:
 gpm-tray-icon.c |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

--- NEW FILE gnome-power-manager-0.3.4-left-click.patch ---
Index: src/gpm-tray-icon.c
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/src/gpm-tray-icon.c,v
retrieving revision 1.18
diff -p -u -r1.18 gpm-tray-icon.c
--- src/gpm-tray-icon.c	21 Jan 2006 11:18:30 -0000	1.18
+++ src/gpm-tray-icon.c	23 Jan 2006 20:30:06 -0000
@@ -330,23 +330,15 @@ gpm_tray_icon_button_press_cb (GtkWidget
 {
 	GtkWidget *popup;
 
-	if (event->type == GDK_2BUTTON_PRESS) {
-		gpm_tray_icon_show_preferences_cb (NULL, icon);
-
-		return TRUE;
-	} else if (event->button == 3) {
-		popup = gtk_ui_manager_get_widget (GTK_UI_MANAGER (icon->priv->ui_manager),
-						   "/GpmTrayPopup");
-		gtk_menu_set_screen (GTK_MENU (popup),
-				     gtk_widget_get_screen (GTK_WIDGET (icon)));
-		gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
-				tray_popup_position_menu, widget,
-				2,
-				gtk_get_current_event_time ());
-		return TRUE;
-	}
-
-	return FALSE;
+	popup = gtk_ui_manager_get_widget (GTK_UI_MANAGER (icon->priv->ui_manager),
+					   "/GpmTrayPopup");
+	gtk_menu_set_screen (GTK_MENU (popup),
+			     gtk_widget_get_screen (GTK_WIDGET (icon)));
+	gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+			tray_popup_position_menu, widget,
+			2,
+			gtk_get_current_event_time ());
+	return TRUE;
 }
 
 static void


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-power-manager.spec	18 Jan 2006 03:47:57 -0000	1.13
+++ gnome-power-manager.spec	24 Jan 2006 18:07:43 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 0.3.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
+Patch1: gnome-power-manager-0.3.4-left-click.patch
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .left-click
 
 %build
 %configure --disable-scrollkeeper
@@ -81,6 +83,9 @@
 %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf
 
 %changelog
+* Tue Jan 24 2006 Christopher Aillon <caillon at redhat.com> - 0.3.4-2
+- Left clicking on the applet should bring up the menu
+
 * Tue Jan 17 2006 Ray Strode <rstrode at redhat.com> - 0.3.4-1
 - update to 0.3.4
 - disable updating scrollkeeper database in buildroot




More information about the fedora-cvs-commits mailing list