Hello community, here is the log from the commit of package gnome-power-manager checked in at Sat Nov 8 19:15:15 CET 2008. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2008-11-07 14:22:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes 2008-11-07 16:58:05.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 7 16:54:47 CET 2008 - vuntz@novell.com + +- Update gnome-power-manager-notify-idle-sleep.patch: better + strings, and use a default compatible for upstream (will change + the default in the branding package). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.a10146/_old 2008-11-08 19:14:54.000000000 +0100 +++ /var/tmp/diff_new_pack.a10146/_new 2008-11-08 19:14:54.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: libnotify-devel libwnck-devel notification-daemon BuildRequires: scrollkeeper update-desktop-files xmlto Version: 2.24.1 -Release: 4 +Release: 5 Url: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL v2 or later @@ -45,7 +45,7 @@ Patch10: gnome-power-manager-schedule-wakeups.patch # PATCH-FIX-OPENSUSE gnome-power-manager-reduce-deps.patch maw@novell.com bnc#440797 Patch11: gnome-power-manager-reduce-deps.patch -# PATCH-FIX-OPENSUSE gnome-power-manager-notify-idle-sleep.patch hmacht bnc#439018 -- notify user about auto suspend when returning from sleep +# PATCH-FEATURE-UPSTREAM gnome-power-manager-notify-idle-sleep.patch hmacht bnc#439018 -- notify user about auto suspend when returning from sleep Patch12: gnome-power-manager-notify-idle-sleep.patch Requires: PolicyKit hal dbus-1 gnome-screensaver notification-daemon Requires: %{name}-lang = %{version} @@ -94,7 +94,7 @@ %package -n gnome-applets-inhibit-powersave License: GPL v2 or later Group: System/GUI/GNOME -Summary: a GNOME panel applet to disable and reenable power saving +Summary: A GNOME panel applet to disable and reenable power saving Requires: %{name} = %{version}-%{release} %description -n gnome-applets-inhibit-powersave @@ -189,6 +189,10 @@ %files lang -f %{name}.lang %changelog +* Fri Nov 07 2008 vuntz@novell.com +- Update gnome-power-manager-notify-idle-sleep.patch: better + strings, and use a default compatible for upstream (will change + the default in the branding package). * Fri Nov 07 2008 hmacht@suse.de - gnome-power-manager-notify-idle-sleep.patch: notify user about auto suspend when returning from sleep (bnc#439018) ++++++ gnome-power-manager-notify-idle-sleep.patch ++++++ --- /var/tmp/diff_new_pack.a10146/_old 2008-11-08 19:14:54.000000000 +0100 +++ /var/tmp/diff_new_pack.a10146/_new 2008-11-08 19:14:54.000000000 +0100 @@ -1,19 +1,19 @@ ---- ../gnome-power-manager-2.24.1.orig/src/gpm-manager.c 2008-11-06 16:24:34.000000000 +0100 -+++ src/gpm-manager.c 2008-11-07 13:47:54.000000000 +0100 -@@ -719,6 +719,28 @@ +Index: src/gpm-manager.c +=================================================================== +--- src/gpm-manager.c.orig ++++ src/gpm-manager.c +@@ -719,6 +719,26 @@ gpm_manager_get_low_battery (GpmManager } /** + * notify_idle_sleep: -+ * @notify: This class instance + * @manager: This class instance + * + * Called when we're back from suspend and the reason for suspend was a + * auto sleep due to system inactivity + **/ +static void -+notify_idle_sleep (GpmNotify *notify, -+ GpmManager *manager) ++notify_idle_sleep (GpmManager *manager) +{ + gboolean show_idle_sleep; + @@ -22,28 +22,42 @@ + + /* only emit if in GConf */ + if (show_idle_sleep) -+ gpm_notify_idle_sleep (notify); ++ gpm_notify_idle_sleep (manager->priv->notify); +} + +/** * idle_do_sleep: * @manager: This class instance * -@@ -763,6 +785,11 @@ +@@ -763,6 +783,11 @@ idle_do_sleep (GpmManager *manager) egg_warning ("cannot suspend or hibernate: %s", error->message); g_error_free (error); } + } else { -+ /* we're back from suspend without an erro, show -+ * the user that we've actually suspended due to -+ * system idleness */ -+ notify_idle_sleep (manager->priv->notify, manager); ++ /* we're back from suspend without an error, tell the ++ * user that we've actually suspended due to system ++ * idleness */ ++ notify_idle_sleep (manager); } } else if (strcmp (action, ACTION_HIBERNATE) == 0) { ---- ../gnome-power-manager-2.24.1.orig/src/gpm-notify.c 2008-11-06 16:24:34.000000000 +0100 -+++ src/gpm-notify.c 2008-11-07 13:54:19.000000000 +0100 -@@ -440,6 +440,38 @@ +@@ -778,6 +803,11 @@ idle_do_sleep (GpmManager *manager) + egg_warning ("cannot suspend or hibernate: %s", error->message); + g_error_free (error); + } ++ } else { ++ /* we're back from hibernate without an error, tell the ++ * user that we've actually suspended due to system ++ * idleness */ ++ notify_idle_sleep (manager); + } + } + g_free (action); +Index: src/gpm-notify.c +=================================================================== +--- src/gpm-notify.c.orig ++++ src/gpm-notify.c +@@ -440,6 +440,37 @@ gpm_notify_low_capacity (GpmNotify *noti } /** @@ -52,12 +66,12 @@ +gboolean +gpm_notify_idle_sleep (GpmNotify *notify) +{ -+ gchar *msg; ++ const gchar *msg; + const gchar *title; + -+ title = _("System resumed from auto sleep"); -+ msg = g_strdup_printf (_("The system returned from an automatic sleep, " -+ "which was initiated because the system was idle.")); ++ title = _("System resumed from sleep"); ++ msg = _("The system automatically went to sleep because the system " ++ "was idle."); + + gpm_notify_create (notify, title, msg, 2, + GTK_STOCK_DIALOG_WARNING, @@ -74,7 +88,6 @@ +#endif + + gpm_notify_show (notify); -+ g_free (msg); + return TRUE; +} + @@ -82,9 +95,11 @@ * gpm_notify_inhibit_lid: **/ gboolean ---- ../gnome-power-manager-2.24.1.orig/src/gpm-notify.h 2008-11-06 16:24:34.000000000 +0100 -+++ src/gpm-notify.h 2008-11-07 11:18:21.000000000 +0100 -@@ -79,6 +79,7 @@ +Index: src/gpm-notify.h +=================================================================== +--- src/gpm-notify.h.orig ++++ src/gpm-notify.h +@@ -79,6 +79,7 @@ gboolean gpm_notify_perhaps_recall (Gpm const gchar *website); gboolean gpm_notify_low_capacity (GpmNotify *notify, guint capacity); @@ -92,8 +107,10 @@ gboolean gpm_notify_inhibit_lid (GpmNotify *notify); gboolean gpm_notify_fully_charged_primary (GpmNotify *notify); gboolean gpm_notify_discharging_primary (GpmNotify *notify); ---- ../gnome-power-manager-2.24.1.orig/data/gnome-power-manager.schemas.in 2008-11-06 16:24:34.000000000 +0100 -+++ data/gnome-power-manager.schemas.in 2008-11-07 11:53:57.000000000 +0100 +Index: data/gnome-power-manager.schemas.in +=================================================================== +--- data/gnome-power-manager.schemas.in.orig ++++ data/gnome-power-manager.schemas.in @@ -657,6 +657,18 @@ </schema> @@ -102,10 +119,10 @@ + <applyto>/apps/gnome-power-manager/notify/idle_sleep</applyto> + <owner>gnome-power-manager</owner> + <type>bool</type> -+ <default>true</default> ++ <default>false</default> + <locale name="C"> -+ <short>If we should show the idle sleep information when returning from suspend</short> -+ <long>If we should show the idle sleep information when returning from suspend.</long> ++ <short>If an information message should be displayed when returning from idle sleep.</short> ++ <long>If an information message should be displayed when returning from idle sleep.</long> + </locale> + </schema> + @@ -113,9 +130,11 @@ <key>/schemas/apps/gnome-power-manager/statistics/show_axis_labels</key> <applyto>/apps/gnome-power-manager/statistics/show_axis_labels</applyto> <owner>gnome-power-manager</owner> ---- ../gnome-power-manager-2.24.1.orig/src/gpm-conf.h 2008-11-06 16:24:34.000000000 +0100 -+++ src/gpm-conf.h 2008-11-07 11:48:33.000000000 +0100 -@@ -124,6 +124,7 @@ +Index: src/gpm-conf.h +=================================================================== +--- src/gpm-conf.h.orig ++++ src/gpm-conf.h +@@ -124,6 +124,7 @@ G_BEGIN_DECLS #define GPM_CONF_NOTIFY_LOW_POWER GPM_CONF_DIR "/notify/low_power" #define GPM_CONF_NOTIFY_ESTIMATED_DATA GPM_CONF_DIR "/notify/estimated_data" #define GPM_CONF_NOTIFY_INHIBIT_LID GPM_CONF_DIR "/notify/inhibit_lid" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org