Hello community, here is the log from the commit of package gnome-power-manager checked in at Fri Nov 7 16:07:53 CET 2008. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2008-11-04 23:27:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes 2008-11-07 14:22:15.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 7 14:02:47 CET 2008 - hmacht@suse.de + +- gnome-power-manager-notify-idle-sleep.patch: notify user about auto + suspend when returning from sleep (bnc#439018) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-power-manager-notify-idle-sleep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.J14417/_old 2008-11-07 16:07:41.000000000 +0100 +++ /var/tmp/diff_new_pack.J14417/_new 2008-11-07 16:07:41.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: libnotify-devel libwnck-devel notification-daemon BuildRequires: scrollkeeper update-desktop-files xmlto Version: 2.24.1 -Release: 3 +Release: 4 Url: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL v2 or later @@ -45,6 +45,8 @@ 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 +Patch12: gnome-power-manager-notify-idle-sleep.patch Requires: PolicyKit hal dbus-1 gnome-screensaver notification-daemon Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -121,6 +123,7 @@ %patch9 %patch10 -p1 %patch11 -p1 +%patch12 -p0 #gnome-patch-translation-update %build @@ -186,6 +189,9 @@ %files lang -f %{name}.lang %changelog +* 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) * Tue Nov 04 2008 maw@suse.de - Split out panel applet subpackages: gnome-applets-brightness and gnome-applets-inhibit-powersave (bnc#440797) @@ -220,14 +226,14 @@ wakeup from suspend and hibernate at a given time on given days. Calculate the seconds-from-now to pass to HAL based on that configuration. Part of the changes needed for fate#302448. -* Mon Sep 01 2008 mboman@novell.com +* Tue Sep 02 2008 mboman@novell.com - Update to version 2.23.91: + Fixed bgo#547502, gnome-power-manager won't configure + Fixed bgo#547766, Crash in gpm_cell_array_update gpm-cell-array.c:273 + Fixed bgo#549789, "unknown" battery type untranslated + Fixed bgo#549854, gpm-cell.c not translator friendly + Translation updates -* Thu Aug 07 2008 captain.magnus@opensuse.org +* Fri Aug 08 2008 captain.magnus@opensuse.org - Update to version 2.23.6: - Fixed bgo#544298, gpm 2.23.3 fails to compile (Richard Hughes) - Fixed bgo#546556, g-p-m unable to startup on Solaris Sparc because of @@ -240,7 +246,7 @@ (Richard Hughes) - Don't use a libnotify window for the battery information, use a GtkDialog instead (Richard Hughes) -* Fri Jul 25 2008 captain.magnus@opensuse.org +* Sat Jul 26 2008 captain.magnus@opensuse.org - Update to version 2.23.3: + Fixed bgo#483144, Gconf key for battery brightness labeled incorrectly... (Richard Hughes) + Fixed bgo#492132, policy timeout prevents computer from suspend (Richard Hughes) @@ -256,7 +262,7 @@ + Fixed bgo#534335, cpu load calculation doesn't work on Solaris (simon.zheng) + Fixed bgo#535271, XBACKLIGHT is very slow (Richard Hughes) + Fixed bgo#536956, Should remove cpufreq_show gconf key (simon.zheng) -* Mon Jun 16 2008 maw@suse.de +* Tue Jun 17 2008 maw@suse.de - Update to version 2.23.1: + Fix a bunch of build warnings with glib trunk + Use Unique to make g-p-p and g-p-s single instance @@ -278,14 +284,14 @@ - Drop obsolete patch: gnome-power-manager-initialize-vars.patch. * Mon May 19 2008 rodrigo@suse.de - Tag patches -* Tue Apr 01 2008 maw@suse.de +* Wed Apr 02 2008 maw@suse.de - Update to version 2.22.1: + Bugs fixed: bgo#517914, bgo#521686, bgo#522078, bgo#522236, bgo#522336, bgo#523152, and bgo#524449 + Updated translations. * Tue Mar 18 2008 maw@suse.de - Disable policykit support pending upstream fixes. -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Bugs fixed: bgi#514590 and bgo#520411 + Add some missing finaliser calls @@ -375,7 +381,7 @@ - Update to version 2.18.0 - b.g.o 414311, 412345, 414010, 411592, 407613, 408705, 383653, and 407613. -* Thu Mar 08 2007 maw@suse.de +* Fri Mar 09 2007 maw@suse.de - Update to version 2.17.91, which brings us: - General fixes: - Fixed #402823, crash in Power Manager: It had crashed when I re... @@ -414,7 +420,7 @@ - Remove dead patches - Update and re-enable gnome-power-manager-yast-settings.patch and gnome-power-manager-disable-actions.patch -* Thu Oct 12 2006 ro@suse.de +* Fri Oct 13 2006 ro@suse.de - added gnome-doc-utils-devel to buildreq * Mon Oct 09 2006 hmacht@suse.de - add temporary patch to grab org.freedesktop.Policy.Power system @@ -552,7 +558,7 @@ * Wed Nov 09 2005 rodrigo@suse.de - Added gnome-session-autostart.patch to include needed files for autostart implementation. -* Sun Oct 23 2005 ro@suse.de +* Mon Oct 24 2005 ro@suse.de - added hal to nfb * Tue Oct 04 2005 rodrigo@suse.de - Added gnome-power-manager-desktop.patch, to show the icon in the ++++++ gnome-power-manager-notify-idle-sleep.patch ++++++ --- ../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 @@ } /** + * 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) +{ + gboolean show_idle_sleep; + + /* only show this if specified in gconf */ + gpm_conf_get_bool (manager->priv->conf, GPM_CONF_NOTIFY_IDLE_SLEEP, &show_idle_sleep); + + /* only emit if in GConf */ + if (show_idle_sleep) + gpm_notify_idle_sleep (notify); +} + +/** * idle_do_sleep: * @manager: This class instance * @@ -763,6 +785,11 @@ 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); } } 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 @@ } /** + * gpm_notify_idle_sleep: + **/ +gboolean +gpm_notify_idle_sleep (GpmNotify *notify) +{ + 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.")); + + gpm_notify_create (notify, title, msg, 2, + GTK_STOCK_DIALOG_WARNING, + GPM_NOTIFY_URGENCY_CRITICAL); + + /* add extra stuff */ +#ifdef HAVE_LIBNOTIFY + notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_IDLE_SLEEP; + notify_notification_add_action (notify->priv->libnotify, + "dont-show-again", + _("Do not show me this again"), + (NotifyActionCallback) notify_general_clicked_cb, + notify, NULL); +#endif + + gpm_notify_show (notify); + g_free (msg); + return TRUE; +} + +/** * 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 @@ const gchar *website); gboolean gpm_notify_low_capacity (GpmNotify *notify, guint capacity); +gboolean gpm_notify_idle_sleep (GpmNotify *notify); 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 @@ -657,6 +657,18 @@ </schema> <schema> + <key>/schemas/apps/gnome-power-manager/notify/idle_sleep</key> + <applyto>/apps/gnome-power-manager/notify/idle_sleep</applyto> + <owner>gnome-power-manager</owner> + <type>bool</type> + <default>true</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> + </locale> + </schema> + + <schema> <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 @@ #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" +#define GPM_CONF_NOTIFY_IDLE_SLEEP GPM_CONF_DIR "/notify/idle_sleep" /* statistics */ #define GPM_CONF_STATS_SHOW_AXIS_LABELS GPM_CONF_DIR "/statistics/show_axis_labels" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org