Hello community, here is the log from the commit of package gnome-power-manager checked in at Fri Mar 31 15:35:01 CEST 2006. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2006-03-29 00:11:43.000000000 +0200 +++ gnome-power-manager/gnome-power-manager.changes 2006-03-31 11:57:54.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 11:57:07 CEST 2006 - rodrigo@suse.de + +- Added gnome-power-manager-disable-actions.patch to disable + handling of powersave button events (#157477). + +------------------------------------------------------------------- New: ---- gnome-power-manager-disable-actions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.nROXtv/_old 2006-03-31 15:34:43.000000000 +0200 +++ /var/tmp/diff_new_pack.nROXtv/_new 2006-03-31 15:34:43.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-power-manager BuildRequires: gnome-common gnome-doc-utils gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel mDNSResponder-devel perl-XML-Parser powersave-devel scrollkeeper update-desktop-files Version: 2.14.0 -Release: 8 +Release: 10 URL: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL @@ -24,6 +24,7 @@ Patch1: gnome-power-manager-autostart.patch Patch3: gnome-power-manager-powersave-dbus.patch Patch4: gnome-power-manager-battery-removal.patch +Patch5: gnome-power-manager-disable-actions.patch Autoreqprov: on Requires: hal dbus-1 gnome-screensaver notification-daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,6 +54,7 @@ %patch1 %patch3 -p1 %patch4 +%patch5 -p1 %build rename no nb po/no.* @@ -104,6 +106,9 @@ %config /usr/share/dbus-1/services/gnome-power-manager.service %changelog -n gnome-power-manager +* Fri Mar 31 2006 - rodrigo@suse.de +- Added gnome-power-manager-disable-actions.patch to disable + handling of powersave button events (#157477). * Wed Mar 29 2006 - dobey@suse.de - Update icons tarball with 24x24 icons instead of 22x22, this changed upstream for the 2.14 release to 24x24, so we need to ++++++ gnome-power-manager-disable-actions.patch ++++++ Only in gnome-power-manager-2.14.0/data: gpm-prefs.glade.bak Only in gnome-power-manager-2.14.0/data: gpm-prefs.gladep Only in gnome-power-manager-2.14.0/data: gpm-prefs.gladep.bak diff -upr gnome-power-manager-2.14.0-orig/src/gpm-hal-monitor.c gnome-power-manager-2.14.0/src/gpm-hal-monitor.c --- gnome-power-manager-2.14.0-orig/src/gpm-hal-monitor.c 2006-03-03 13:45:33.000000000 +0100 +++ gnome-power-manager-2.14.0/src/gpm-hal-monitor.c 2006-03-30 17:50:06.000000000 +0200 @@ -288,12 +288,13 @@ watch_device_condition (DBusGProxy *p const char *udi = NULL; char *button_name = NULL; gboolean value; + extern gboolean gpm_enable_actions; udi = dbus_g_proxy_get_path (proxy); gpm_debug ("udi=%s, condition_name=%s", udi, condition_name); - if (strcmp (condition_name, "ButtonPressed") == 0) { + if (gpm_enable_actions && strcmp (condition_name, "ButtonPressed") == 0) { /* We can get two different types of ButtonPressed condition 1. The old acpi hardware buttons udi="acpi_foo", details=""; Only in gnome-power-manager-2.14.0/src: gpm-hal-monitor.c~ diff -upr gnome-power-manager-2.14.0-orig/src/gpm-main.c gnome-power-manager-2.14.0/src/gpm-main.c --- gnome-power-manager-2.14.0-orig/src/gpm-main.c 2006-03-27 18:58:01.000000000 +0200 +++ gnome-power-manager-2.14.0/src/gpm-main.c 2006-03-31 11:03:46.000000000 +0200 @@ -47,6 +47,8 @@ #include "gpm-manager-glue.h" #include "gpm-screensaver.h" +gboolean gpm_enable_actions = FALSE; + static void gpm_exit (GpmManager *manager); /** registers org.gnome.PowerManager on a connection Only in gnome-power-manager-2.14.0-orig/src: gpm-main.c.orig Only in gnome-power-manager-2.14.0-orig/src: gpm-manager.c~ Only in gnome-power-manager-2.14.0-orig/src: gpm-manager.h~ diff -upr gnome-power-manager-2.14.0-orig/src/gpm-prefs.c gnome-power-manager-2.14.0/src/gpm-prefs.c --- gnome-power-manager-2.14.0-orig/src/gpm-prefs.c 2006-03-13 20:10:01.000000000 +0100 +++ gnome-power-manager-2.14.0/src/gpm-prefs.c 2006-03-31 11:04:11.000000000 +0200 @@ -63,6 +63,8 @@ static GConfEnumStringPair icon_policy_e #define GPM_DBUS_PATH "/org/gnome/PowerManager" #define GPM_DBUS_INTERFACE "org.gnome.PowerManager" +gboolean gpm_enable_actions = FALSE; + /* If sleep time in a slider is set to 61 it is considered as never sleep */ const int NEVER_TIME_ON_SLIDER = 61; @@ -550,12 +552,21 @@ setup_sleep_type (GladeXML *xml) static void setup_ac_actions (GladeXML *xml) { + GtkWidget *vbox_actions; GtkWidget *label_button_lid; GtkWidget *combo_button_lid; GtkWidget *vbox_ac_actions; gboolean has_lid_button; const char *button_lid_actions[] = {ACTION_BLANK, ACTION_SUSPEND, ACTION_HIBERNATE, NULL}; + vbox_actions = glade_xml_get_widget (xml, "vbox_ac_actions"); + if (gpm_enable_actions) + gtk_widget_show (vbox_actions); + else { + gtk_widget_hide (vbox_actions); + return; + } + label_button_lid = glade_xml_get_widget (xml, "label_ac_button_lid"); combo_button_lid = glade_xml_get_widget (xml, "combobox_ac_lid_close"); vbox_ac_actions = glade_xml_get_widget (xml, "vbox_ac_actions"); @@ -578,6 +589,7 @@ setup_ac_actions (GladeXML *xml) static void setup_battery_actions (GladeXML *xml) { + GtkWidget *vbox_actions; GtkWidget *label_button_lid; GtkWidget *combo_button_lid; GtkWidget *label_battery_critical; @@ -592,6 +604,14 @@ setup_battery_actions (GladeXML *xml) return; } + vbox_actions = glade_xml_get_widget (xml, "vbox_battery_actions"); + if (gpm_enable_actions) + gtk_widget_show (vbox_actions); + else { + gtk_widget_hide (vbox_actions); + return; + } + /* Button Lid Combo Box */ label_button_lid = glade_xml_get_widget (xml, "label_battery_button_lid"); combo_button_lid = glade_xml_get_widget (xml, "combobox_battery_lid_close"); Only in gnome-power-manager-2.14.0/src: gpm-prefs.c~ Only in gnome-power-manager-2.14.0-orig/src: Makefile.am.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de