Hello community, here is the log from the commit of package gnome-power-manager checked in at Fri Sep 29 17:41:25 CEST 2006. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2006-09-14 20:36:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes 2006-09-29 11:23:21.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 29 11:23:12 CEST 2006 - rodrigo@suse.de + +- Removed gnome-power-manager-powersave-dbus.patch, we don't connect + to the powersave daemon anymore. +- Move the part of the patch to add the YAST button to its own file. + +------------------------------------------------------------------- Old: ---- gnome-power-manager-powersave-dbus.patch New: ---- gnome-power-manager-yast-settings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.H8Xu3b/_old 2006-09-29 17:41:02.000000000 +0200 +++ /var/tmp/diff_new_pack.H8Xu3b/_new 2006-09-29 17:41:02.000000000 +0200 @@ -11,9 +11,9 @@ # norootforbuild Name: gnome-power-manager -BuildRequires: ImageMagick-devel 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 +BuildRequires: ImageMagick-devel gnome-common gnome-doc-utils 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.0 -Release: 1 +Release: 4 URL: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL @@ -23,7 +23,7 @@ Source2: %{name}-po.tar.bz2 Patch: gnome-power-manager-desktop.patch Patch1: gnome-power-manager-autostart.patch -Patch3: gnome-power-manager-powersave-dbus.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 @@ -114,6 +114,10 @@ %config /usr/share/dbus-1/services/gnome-power-manager.service %changelog -n gnome-power-manager +* Fri Sep 29 2006 - rodrigo@suse.de +- Removed gnome-power-manager-powersave-dbus.patch, we don't connect + to the powersave daemon anymore. +- Move the part of the patch to add the YAST button to its own file. * Thu Sep 14 2006 - jhargadon@suse.de - update to version 2.16.0 - Turn off Werror in configure. #352448 ++++++ gnome-power-manager-yast-settings.patch ++++++ 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> + + <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="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> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <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 * } static void +gpm_system_settings_cb (GtkButton *button, gpointer user_data) +{ + GError *error = NULL; + + if (!g_spawn_command_line_async ("gnomesu /sbin/yast2 power-management", &error)) { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new_with_markup (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "<span size='larger'><b>%s</b></span>", + GPM_NAME); + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), error->message); + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + g_error_free (error); + } +} + +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); } + + /* 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; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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