![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gnome-power-manager checked in at Mon Oct 16 23:55:37 CEST 2006. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2006-10-13 01:04:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes 2006-10-16 21:18:26.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 16 21:16:39 CEST 2006 - danw@suse.de + +- Remove dead patches +- Update and re-enable gnome-power-manager-yast-settings.patch and + gnome-power-manager-disable-actions.patch + +------------------------------------------------------------------- Old: ---- gnome-power-manager-165471.patch gnome-power-manager-battery-removal.patch gnome-power-manager-prefs-layout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.IQNmen/_old 2006-10-16 23:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IQNmen/_new 2006-10-16 23:52:25.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-power-manager BuildRequires: ImageMagick-devel gnome-common gnome-doc-utils gnome-doc-utils-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files Version: 2.16.1 -Release: 4 +Release: 7 URL: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL @@ -24,10 +24,7 @@ Patch: gnome-power-manager-desktop.patch Patch1: gnome-power-manager-autostart.patch Patch3: gnome-power-manager-yast-settings.patch -Patch4: gnome-power-manager-battery-removal.patch Patch5: gnome-power-manager-disable-actions.patch -Patch6: gnome-power-manager-165471.patch -Patch7: gnome-power-manager-prefs-layout.patch Patch8: gpm-zh_CN-translation.patch Patch9: gnome-power-manager-system-policy.patch Autoreqprov: on @@ -57,11 +54,8 @@ %setup -b 1 -b 2 %patch %patch1 -#%patch3 -p1 -#%patch4 -#%patch5 -p1 -#%patch6 -p1 -#%patch7 -p1 +%patch3 +%patch5 %patch8 %patch9 @@ -116,6 +110,10 @@ %config /usr/share/dbus-1/services/gnome-power-manager.service %changelog -n gnome-power-manager +* Mon Oct 16 2006 - danw@suse.de +- Remove dead patches +- Update and re-enable gnome-power-manager-yast-settings.patch and + gnome-power-manager-disable-actions.patch * Fri Oct 13 2006 - ro@suse.de - added gnome-doc-utils-devel to buildreq * Mon Oct 09 2006 - hmacht@suse.de ++++++ gnome-power-manager-disable-actions.patch ++++++ --- /var/tmp/diff_new_pack.IQNmen/_old 2006-10-16 23:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IQNmen/_new 2006-10-16 23:52:25.000000000 +0200 @@ -1,44 +1,37 @@ -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 @@ +--- src/gpm-hal-monitor.c ++++ src/gpm-hal-monitor.c +@@ -247,6 +247,8 @@ + } + } + ++extern gboolean gpm_enable_actions; ++ + /** + * hal_device_condition_cb: + * +@@ -266,7 +268,7 @@ + { + gpm_debug ("udi=%s, condition=%s, details=%s", udi, condition, details); + +- if (strcmp (condition, "ButtonPressed") == 0) { ++ if (gpm_enable_actions && strcmp (condition, "ButtonPressed") == 0) { + emit_button_pressed (monitor, udi, details); + } + } +--- src/gpm-main.c ++++ src/gpm-main.c +@@ -42,6 +42,8 @@ + #include "gpm-manager.h" #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 + /** +--- src/gpm-prefs-core.c ++++ src/gpm-prefs-core.c +@@ -92,6 +92,8 @@ #define GPM_DBUS_PATH "/org/gnome/PowerManager" #define GPM_DBUS_INTERFACE "org.gnome.PowerManager" @@ -47,50 +40,60 @@ /* 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}; +@@ -665,6 +667,15 @@ + ACTION_HIBERNATE, + NULL}; -+ vbox_actions = glade_xml_get_widget (xml, "vbox_ac_actions"); ++ vbox_ac_actions = glade_xml_get_widget (prefs->priv->glade_xml, ++ "vbox_ac_actions"); + if (gpm_enable_actions) -+ gtk_widget_show (vbox_actions); ++ gtk_widget_show (vbox_ac_actions); + else { -+ gtk_widget_hide (vbox_actions); ++ gtk_widget_hide (vbox_ac_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) + gpm_prefs_setup_action_combo (prefs, "combobox_ac_lid_close", + GPM_PREF_AC_BUTTON_LID, + button_lid_actions); +@@ -677,8 +688,6 @@ + gtk_widget_hide_all (checkbox_powersave); + if (!prefs->priv->has_button_lid) { + /* hide the whole vbox if we don't have a lid */ +- vbox_ac_actions = glade_xml_get_widget (prefs->priv->glade_xml, +- "vbox_ac_actions"); + gtk_widget_hide_all (vbox_ac_actions); + } + } +@@ -693,6 +702,7 @@ { -+ 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; - } ++ GtkWidget *vbox_battery_actions; + const char *button_lid_actions[] = {ACTION_NOTHING, + ACTION_BLANK, + ACTION_SUSPEND, +@@ -704,6 +714,14 @@ + ACTION_SHUTDOWN, + NULL}; -+ vbox_actions = glade_xml_get_widget (xml, "vbox_battery_actions"); ++ vbox_battery_actions = glade_xml_get_widget (prefs->priv->glade_xml, "vbox_battery_actions"); + if (gpm_enable_actions) -+ gtk_widget_show (vbox_actions); ++ gtk_widget_show (vbox_battery_actions); + else { -+ gtk_widget_hide (vbox_actions); ++ gtk_widget_hide (vbox_battery_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 + gpm_prefs_setup_action_combo (prefs, "combobox_battery_lid_close", + GPM_PREF_BATTERY_BUTTON_LID, +@@ -1038,7 +1056,7 @@ + } + + /* setup system settings button */ +- widget = glade_xml_get_widget (glade_xml, "button_system_settings"); ++ widget = glade_xml_get_widget (prefs->priv->glade_xml, "button_system_settings"); + g_signal_connect (G_OBJECT (widget), "clicked", + G_CALLBACK (gpm_system_settings_cb), NULL); + ++++++ gnome-power-manager-system-policy.patch ++++++ --- /var/tmp/diff_new_pack.IQNmen/_old 2006-10-16 23:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IQNmen/_new 2006-10-16 23:52:25.000000000 +0200 @@ -1,6 +1,6 @@ --- src/gpm-main.c +++ src/gpm-main.c -@@ -134,6 +134,7 @@ +@@ -136,6 +136,7 @@ GError *error = NULL; GOptionContext *context; GnomeProgram *program; @@ -8,7 +8,7 @@ const GOptionEntry options[] = { { "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon, -@@ -221,6 +222,20 @@ +@@ -223,6 +224,20 @@ loop = g_main_loop_new (NULL, FALSE); ++++++ gnome-power-manager-yast-settings.patch ++++++ --- /var/tmp/diff_new_pack.IQNmen/_old 2006-10-16 23:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IQNmen/_new 2006-10-16 23:52:25.000000000 +0200 @@ -1,89 +1,69 @@ -diff -upr gnome-power-manager-2.14.0-orig/data/gpm-prefs.glade gnome-power-manager-2.14.0/data/gpm-prefs.glade ---- gnome-power-manager-2.14.0-orig/data/gpm-prefs.glade 2006-03-13 18:19:58.000000000 +0100 -+++ gnome-power-manager-2.14.0/data/gpm-prefs.glade 2006-04-03 15:04:22.000000000 +0200 -@@ -19,6 +19,7 @@ - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> -+ <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="vbox1"> -@@ -1162,6 +1163,84 @@ - <property name="fill">False</property> - </packing> - </child> +--- data/gpm-prefs.glade ++++ data/gpm-prefs.glade +@@ -1611,6 +1611,84 @@ + <property name="fill">False</property> + </packing> + </child> ++ ++ <child> ++ <widget class="GtkButton" id="button_system_settings"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> ++ ++ <child> ++ <widget class="GtkAlignment" id="alignment21"> ++ <property name="visible">True</property> ++ <property name="xalign">0.5</property> ++ <property name="yalign">0.5</property> ++ <property name="xscale">0</property> ++ <property name="yscale">0</property> ++ <property name="top_padding">0</property> ++ <property name="bottom_padding">0</property> ++ <property name="left_padding">0</property> ++ <property name="right_padding">0</property> ++ ++ <child> ++ <widget class="GtkHBox" id="hbox1"> ++ <property name="visible">True</property> ++ <property name="homogeneous">False</property> ++ <property name="spacing">2</property> ++ ++ <child> ++ <widget class="GtkImage" id="image1"> ++ <property name="visible">True</property> ++ <property name="stock">gtk-properties</property> ++ <property name="icon_size">4</property> ++ <property name="xalign">0.5</property> ++ <property name="yalign">0.5</property> ++ <property name="xpad">0</property> ++ <property name="ypad">0</property> ++ </widget> ++ <packing> ++ <property name="padding">0</property> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ </packing> ++ </child> + + <child> -+ <widget class="GtkButton" id="button_system_settings"> ++ <widget class="GtkLabel" id="label30"> + <property name="visible">True</property> -+ <property name="can_focus">True</property> -+ <property name="relief">GTK_RELIEF_NORMAL</property> -+ <property name="focus_on_click">True</property> -+ -+ <child> -+ <widget class="GtkAlignment" id="alignment21"> -+ <property name="visible">True</property> -+ <property name="xalign">0.5</property> -+ <property name="yalign">0.5</property> -+ <property name="xscale">0</property> -+ <property name="yscale">0</property> -+ <property name="top_padding">0</property> -+ <property name="bottom_padding">0</property> -+ <property name="left_padding">0</property> -+ <property name="right_padding">0</property> -+ -+ <child> -+ <widget class="GtkHBox" id="hbox1"> -+ <property name="visible">True</property> -+ <property name="homogeneous">False</property> -+ <property name="spacing">2</property> -+ -+ <child> -+ <widget class="GtkImage" id="image1"> -+ <property name="visible">True</property> -+ <property name="stock">gtk-properties</property> -+ <property name="icon_size">4</property> -+ <property name="xalign">0.5</property> -+ <property name="yalign">0.5</property> -+ <property name="xpad">0</property> -+ <property name="ypad">0</property> -+ </widget> -+ <packing> -+ <property name="padding">0</property> -+ <property name="expand">False</property> -+ <property name="fill">False</property> -+ </packing> -+ </child> -+ -+ <child> -+ <widget class="GtkLabel" id="label30"> -+ <property name="visible">True</property> -+ <property name="label" translatable="yes">System settings</property> -+ <property name="use_underline">True</property> -+ <property name="use_markup">False</property> -+ <property name="justify">GTK_JUSTIFY_LEFT</property> -+ <property name="wrap">False</property> -+ <property name="selectable">False</property> -+ <property name="xalign">0.5</property> -+ <property name="yalign">0.5</property> -+ <property name="xpad">0</property> -+ <property name="ypad">0</property> -+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> -+ <property name="width_chars">-1</property> -+ <property name="single_line_mode">False</property> -+ <property name="angle">0</property> -+ </widget> -+ <packing> -+ <property name="padding">0</property> -+ <property name="expand">False</property> -+ <property name="fill">False</property> -+ </packing> -+ </child> -+ </widget> -+ </child> -+ </widget> -+ </child> ++ <property name="label" translatable="yes">System settings</property> ++ <property name="use_underline">True</property> ++ <property name="use_markup">False</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> ++ <property name="wrap">False</property> ++ <property name="selectable">False</property> ++ <property name="xalign">0.5</property> ++ <property name="yalign">0.5</property> ++ <property name="xpad">0</property> ++ <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> @@ -91,17 +71,27 @@ + <property name="fill">False</property> + </packing> + </child> - </widget> - </child> - </widget> -Only in gnome-power-manager-2.14.0/src: gpm-main.c~ -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-04-03 15:04:22.000000000 +0200 -@@ -425,6 +425,28 @@ gpm_prefs_checkbox_lock_cb (GtkWidget * ++ </widget> ++ </child> ++ </widget> ++ </child> ++ </widget> ++ <packing> ++ <property name="padding">0</property> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ </packing> ++ </child> + </widget> + <packing> + <property name="tab_expand">False</property> +--- src/gpm-prefs-core.c ++++ src/gpm-prefs-core.c +@@ -514,6 +514,28 @@ + gconf_client_set_bool (prefs->priv->gconf_client, gpm_pref_key, checked, NULL); } - static void ++static void +gpm_system_settings_cb (GtkButton *button, gpointer user_data) +{ + GError *error = NULL; @@ -123,19 +113,18 @@ + } +} + -+static void - gpm_prefs_setup_checkbox (GtkWidget *widget, - char *gpm_pref_key) - { -@@ -731,6 +753,12 @@ gpm_prefs_create (void) - widget = glade_xml_get_widget (glade_xml, "gpm_notebook"); - gtk_notebook_remove_page (GTK_NOTEBOOK(widget), 1); + /** + * gpm_prefs_setup_checkbox: + * @prefs: This prefs class instance +@@ -1015,6 +1037,11 @@ + gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page); } -+ + + /* setup system settings button */ + widget = glade_xml_get_widget (glade_xml, "button_system_settings"); + g_signal_connect (G_OBJECT (widget), "clicked", + G_CALLBACK (gpm_system_settings_cb), NULL); + - return main_window; + gtk_widget_show (main_window); } + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de