Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory
checked in at Fri Sep 9 11:20:12 CEST 2011.
--------
--- GNOME/gnome-settings-daemon/gnome-settings-daemon.changes 2011-07-25
13:04:21.000000000 +0200
+++
/mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon.changes
2011-09-08 09:17:10.000000000 +0200
@@ -1,0 +2,134 @@
+Thu Sep 8 06:59:13 UTC 2011 - vu...@opensuse.org
+
+- Disable gnome-settings-daemon-system-proxy-configuration.diff for
+ now: we really need to fix it the proper way, which likely
+ involves libproxy, as mentioned in
+ http://code.google.com/p/libproxy/issues/detail?id=165 (tracked
+ in bnc#690493).
+- Also note that gnome-packagekit-fate302445.patch is not enabled
+ right now (tracked in bnc#689592).
+
+-------------------------------------------------------------------
+Mon Sep 5 15:51:46 UTC 2011 - vu...@opensuse.org
+
+- Update to version 3.1.91:
+ + Common:
+ - Don't list XINPUT_LIBS twice, move X11_LIBS from LDFLAGS to
+ LIBADD
+ + Color:
+ - Ensure the 'Recalibration required' notification has a custom
+ app name
+ - Fix a critical warning on startup
+ - Do not notify to recalibrate on every startup
+ + Daemon:
+ - Fix possible double-free outside gnome-session
+ + Gconf:
+ - Double check stuff we add to the hash table (bgo#658055)
+ + Housekeeping:
+ - NULL-terminate the ignore-paths array (bgo#657849)
+ + Power:
+ - Do not exit gnome-settings-daemon if upower fails to load
+ - Fix impossible to hit error paths (bgo#657364)
+ - Fix BRIGHTESS_STEP_AMOUNT calculation macro
+ - Do most of the work in _start () (bgo#657924)
+ - Never idle-dim the display to a higher brightness level
+ (bgo#658144)
+ + Printers:
+ - Remove redundant code
+ + Xsettings:
+ - Handle rgba-order key (bgo#657525)
+ - Don't poke at an empty hashtable (bgo#657464)
+ - Fix a stray brace
+ + Updated translations.
+
+-------------------------------------------------------------------
+Thu Sep 1 14:28:30 UTC 2011 - vu...@opensuse.org
+
+- Update to version 3.1.90:
+ + A11Y-keyboard:
+ - Use GIO's DBus API instead of dbus-glib's
+ + Color:
+ - Don't use uninitialized GErrors
+ - Do not set an age for display and printer profiles
+ - Remove the ability to disable notifications
+ - Do not search user-icc directories if they do not exist
+ (bgo#657484)
+ + Daemon:
+ - Add Unity to OnlyShowIn value for autostart desktop file
+ (bgo#654919)
+ + Media keys:
+ - Don't go up to 11 (bgo#649411)
+ + Mouse:
+ - Be more careful to avoid segfaults (bgo#657462)
+ + Power:
+ - Ensure the critical battery beep is stopped when the AC is
+ inserted
+ - Ensure we lock the screen before suspending on lid close
+ (bgo#655924)
+ - Add mention of bgo#652183
+ + Smartcard:
+ - Use GIO's DBus API instead of dbus-glib's
+ + Updates:
+ - Do not log a warning if the firmware-missing file does not
+ exist
+ - Do not log a warning at startup if getting the upgrade list
+ is not supported (bgo#657483)
+ + Updated translations.
+- Rebase gnome-settings-daemon-bnc462640-mute-action.patch.
+- Add polkit Requires: the power plugin uses pkexec.
+
+-------------------------------------------------------------------
+Thu Aug 18 08:58:07 CEST 2011 - dims...@opensuse.org
+
+- Update to version 3.1.5:
+ + A11y-keyboard:
+ - Enable plugin by default (bgo#656287)
+ + Automount:
+ - Link against the private profiler library
+ - Add some missing includes
+ - Don't ship the .in file, just the .in.in one
+ - Silence two trivial -Wformat-security warnings
+ + Color:
+ - Do not show multiple warnings if colord is not available at
+ runtime
+ - Fix a potential crash when unloading the color plugin
+ - Fix a potential crash if creating the per-user ICC directory
+ fails
+ - Make lcms2 a hard dependency
+ + Housekeeping:
+ - Use g_format_size() instead of g_format_size_for_display()
+ + Media keys:
+ - Don't preserve the path after filling
+ - Remove the half pixel offset from the progressbar fill
+ - Always round the render coordinates for media icons
+ + Power:
+ - Add the idle actions
+ - Show a status icon when in fallback mode
+ - Respect the idle-dim-ac and idle-dim-battery configuration
+ keys
+ - Add a backlight helper, as xbacklight isn't always present
+ - Fall back to the backlight helper if xbacklight is not
+ available
+ - Fix a potential crash when unloading the power plugin
+ - Ensure we return the new percentage when changing the
+ brightness
+ + Updates:
+ - Do not use deprecated PackageKit #defines
+ + Wacom:
+ - Invert TPCButton setting (bgo#656372)
+ + Updated translations.
+
+-------------------------------------------------------------------
+Fri Jul 29 04:19:01 UTC 2011 - g...@suse.com
+
+- Rebase gnome-settings-daemon-system-proxy-configuration.diff and
+ gnome-settings-daemon-bnc462640-mute-action.patch, and re-enable
+ the the call to autoreconf.
+- Add gnome-settings-daemon-stop-reload-proxy-settings.patch to
+ stop the g-s-d packagekit plugin from popping up an
+ authentication window when reloading the proxy settings
+ (bnc#689592#c1 for bnc#538353)
+- Port gnome-packagekit-fate302445.patch to gnome-settings-daemon
+ and GSettings.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-settings-daemon-3.1.4.tar.bz2
New:
----
gnome-settings-daemon-3.1.91.tar.bz2
gnome-settings-daemon-stop-reload-proxy-settings.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.TY0l1M/_old 2011-09-09 11:20:05.000000000 +0200
+++ /var/tmp/diff_new_pack.TY0l1M/_new 2011-09-09 11:20:05.000000000 +0200
@@ -18,18 +18,18 @@
Name: gnome-settings-daemon
-Version: 3.1.4
+Version: 3.1.91
Release: 1
License: GPLv2+
Summary: Settings daemon for the GNOME desktop
Url: http://www.gnome.org
Group: System/GUI/GNOME
Source:
http://download.gnome.org/sources/gnome-settings-daemon/3.1/%{name}-%{version}.tar.bz2
-# PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
(was PATCH-FEATURE-OPENSUSE)
+# PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
Patch2: gnome-settings-daemon-system-proxy-configuration.diff
# PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203
jblu...@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM)
Patch8: gnome-settings-daemon-apport-monitor.patch
-# PATCH-NEEDS-REBASE gnome-settings-daemon-bnc462640-mute-action.patch
bnc462640 bgo572365 vu...@novell.com -- Mute button should always mute sound
instead of toggling mute status (was PATCH-FEATURE-UPSTREAM)
+# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch
bnc462640 bgo572365 vu...@novell.com -- Mute button should always mute sound
instead of toggling mute status
Patch10: gnome-settings-daemon-bnc462640-mute-action.patch
# PATCH-NEEDS-REBASE gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
bnc461755 feder...@novell.com - Add the option of rotating a Wacom tablet when
rotating the monitor with RANDR (was PATCH-FEATURE-OPENSUSE)
Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
@@ -41,6 +41,8 @@
Patch15: gnome-packagekit-BNC383261.patch
# PATCH-FIX-UPSTREAM bgo#654970 bnc#675969
gnome-settings-daemon-ntp-support.patch vu...@opensuse.org -- Add SUSE support
for datetime polkit helper
Patch16: gnome-settings-daemon-ntp-support.patch
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch
bnc689592#c1, bnc#538353 g...@suse.com -- Stop g-s-d poping up the
authentication dialog for reloading the proxy settings
+Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch
BuildRequires: fdupes
BuildRequires: gnome-common
# Disabled because of the non-rebased patches
@@ -50,31 +52,33 @@
BuildRequires: update-desktop-files
BuildRequires: cups-devel
BuildRequires: pkgconfig(colord)
-BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(dbus-glib-1) >= 0.7.4
BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(gconf-2.0)
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
+BuildRequires: pkgconfig(glib-2.0) >= 2.29.14
%if 0%{?BUILD_FROM_VCS}
BuildRequires: gnome-common
%endif
-BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.5
BuildRequires: pkgconfig(gsettings-desktop-schemas)
-BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtk+-3.0) >= 2.99.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnomekbd)
BuildRequires: pkgconfig(libgnomekbdui)
-BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(nss)
-BuildRequires: pkgconfig(packagekit-glib2)
+BuildRequires: pkgconfig(packagekit-glib2) >= 0.6.12
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
Requires: gsettings-desktop-schemas
+# g-s-d uses the pkexec binary
+Requires: polkit
Recommends: %{name}-lang
# For housekeeping plugin, that uses the nautilus dbus service
Recommends: nautilus
@@ -125,18 +129,19 @@
%if !0%{?BUILD_FROM_VCS}
# Disabled because of the non-rebased patches
#gnome-patch-translation-prepare
-#%patch2 -p0
-#%patch8 -p0
-#%patch10 -p0
+#%%patch2 -p0
+#%%patch8 -p0
+%patch10 -p0
# PATCH-NEEDS-REBASE
-#%patch11 -p1
+#%%patch11 -p1
# PATCH-NEEDS-REBASE
-#%patch13 -p0
+#%%patch13 -p0
# PATCH-NEEDS-REBASE
-#%patch14 -p0
+#%%patch14 -p0
# PATCH-NEEDS-REBASE
-#%patch15 -p0
+#%%patch15 -p0
%patch16 -p1
+%patch17 -p1
%endif
%if 0%{?BUILD_FROM_VCS}
@@ -144,8 +149,7 @@
%endif
%build
-# Disabled because of the non-rebased patches
-#autoreconf -f -i
+autoreconf -f -i
%configure\
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
--enable-gconf-bridge \
@@ -185,8 +189,11 @@
%dir %{_libexecdir}/gnome-settings-daemon-3.0
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-fallback-mount-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
+# From patch2
+#%{_libexecdir}/gnome-settings-daemon-3.0/novell-sysconfig-proxy-helper
%if "%{_libdir}" != "%{_libexecdir}"
%dir %{_libdir}/gnome-settings-daemon-3.0/
%endif
@@ -204,10 +211,13 @@
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
+# From patch2
+#%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
%{_datadir}/icons/*/*/*
+%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
%{_mandir}/man1/gnome-settings-daemon.1*
# Own the directory since we can't depend on gconf providing them
%dir %{_datadir}/GConf
++++++ gnome-packagekit-fate302445.patch ++++++
--- /var/tmp/diff_new_pack.TY0l1M/_old 2011-09-09 11:20:05.000000000 +0200
+++ /var/tmp/diff_new_pack.TY0l1M/_new 2011-09-09 11:20:05.000000000 +0200
@@ -1,120 +1,133 @@
-Index: gnome-packagekit-2.91.4/src/gpk-update-icon.c
-===================================================================
---- gnome-packagekit-2.91.4.orig/src/gpk-update-icon.c
-+++ gnome-packagekit-2.91.4/src/gpk-update-icon.c
-@@ -48,6 +48,78 @@ static GpkFirmware *firmware = NULL;
- static GpkHardware *hardware = NULL;
- static guint timer_id = 0;
- static gboolean timed_exit = FALSE;
-+static GSettings *settings = NULL;
+diff --git a/data/gnome-settings-daemon.convert
b/data/gnome-settings-daemon.convert
+index 9ecc65f..5a6efbc 100644
+--- a/data/gnome-settings-daemon.convert
++++ b/data/gnome-settings-daemon.convert
+@@ -93,6 +93,9 @@ priority =
/apps/gnome_settings_daemon/plugins/smartcard/priority
+ active = /apps/gnome_settings_daemon/plugins/sound/active
+ priority = /apps/gnome_settings_daemon/plugins/sound/priority
+
++[org.gnome.settings-daemon.plugins.updates]
++asked-to-collect-hardware-info =
/apps/gnome-packagekit/updater_asked_to_collect_hardware_information
+
-+#define GPK_UPDATE_HARDWARE_SEND_ACTION "gpk-update-icon hardware info - send
"
-+#define GPK_UPDATE_HARDWARE_DONT_PROMPT_ACTION "gpk-update-icon hardware info
- don't ask again"
+ [org.gnome.settings-daemon.plugins.xrandr]
+ active = /apps/gnome_settings_daemon/plugins/xrandr/active
+ default-configuration-file =
/apps/gnome_settings_daemon/xrandr/default_configuration_file
+diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+index c09096a..67081e2 100644
+--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+@@ -120,5 +120,10 @@
+ <_summary>The filenames on removable media that designate it a software
source.</_summary>
+ <_description>When removable media is inserted, it is checked to see if
it contains any important filenames in the root directory. If the filename
matches, then an updates check is performed. This allows post-install disks to
be used to update running systems.</_description>
+ </key>
++ <key name="asked-to-collect-hardware-info" type="b">
++ <default>false</default>
++ <_summary>Whether the hardware information collection is
asked</_summary>
++ <_description>Whether the hardware information collection is
asked</_description>
++ </key>
+ </schema>
+ </schemalist>
+diff --git a/plugins/updates/gsd-updates-manager.c
b/plugins/updates/gsd-updates-manager.c
+index 5c193e9..b1abcc5 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -35,6 +35,10 @@
+ #include "gsd-updates-common.h"
+ #include "gnome-settings-profile.h"
+
++#define GSD_UPDATES_HARDWARE_SEND_ACTION "gsd-updates hardware info -
send "
++#define GSD_UPDATES_HARDWARE_DONT_PROMPT_ACTION "gsd-updates hardware
info - don't ask again"
++#define GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT
"asked-to-collect-hardware-info"
+
+ #define GSD_UPDATES_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GSD_TYPE_UPDATES_MANAGER, GsdUpdatesManagerPrivate))
+
+ #define MAX_FAILED_GET_UPDATES 10 /* the maximum number of tries
*/
+@@ -1308,6 +1312,79 @@ on_bus_gotten (GObject *source_object,
+ NULL);
+ }
+
+static void
-+gpk_update_libnotify_cb (NotifyNotification *notification, gchar *action,
gpointer data)
++gsd_updates_libnotify_cb (NotifyNotification *notification,
++ gchar *action,
++ gpointer data)
+{
-+ if (g_strcmp0 (action, GPK_UPDATE_HARDWARE_SEND_ACTION ) == 0) {
-+ gboolean retval = g_spawn_command_line_async
("/usr/bin/smoltGui", NULL);
-+ if (!retval) {
-+ g_debug ("Failure launching smoltGui");
-+ }
-+ g_debug ("set %s to TRUE because done",
GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
-+ g_settings_set_boolean (settings,
GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT, TRUE);
-+ } else if (g_strcmp0 (action, GPK_UPDATE_HARDWARE_DONT_PROMPT_ACTION)
== 0) {
-+ g_debug ("set %s to TRUE because user said no",
GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
-+ g_settings_set_boolean (settings,
GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT, TRUE);
-+ } else {
-+ g_warning ("unknown action id: %s", action);
-+ }
++ GsdUpdatesManager *manager = GSD_UPDATES_MANAGER (data);
++
++ if (g_strcmp0 (action, GSD_UPDATES_HARDWARE_SEND_ACTION ) == 0) {
++ gboolean retval = g_spawn_command_line_async
("/usr/bin/smoltGui", NULL);
++ if (!retval) {
++ g_debug ("Failure launching smoltGui");
++ }
++ g_debug ("set %s to TRUE because done",
GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
++ g_settings_set_boolean (manager->priv->settings_gsd,
GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT, TRUE);
++ } else if (g_strcmp0 (action, GSD_UPDATES_HARDWARE_DONT_PROMPT_ACTION)
== 0) {
++ g_debug ("set %s to TRUE because user said no",
GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
++ g_settings_set_boolean (manager->priv->settings_gsd,
GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT, TRUE);
++ } else {
++ g_warning ("unknown action id: %s", action);
++ }
+
+}
+
+static gboolean
-+check_for_collect_hardware_information (gpointer data)
++check_for_collect_hardware_information (gpointer *data)
+{
-+ gboolean asked_to_collect = FALSE;
++ GsdUpdatesManager *manager = GSD_UPDATES_MANAGER (data);
++ gboolean asked_to_collect = FALSE;
+
-+ NotifyNotification *notification;
-+ GError *error = NULL;
-+ gchar *body, *summary;
-+ //gchar *body2;
-+ gboolean ret;
-+
-+ asked_to_collect = g_settings_get_boolean (settings,
GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
-+
-+ if (asked_to_collect) {
-+ g_debug ("don't collect hardware info because already done");
-+ return FALSE;
-+ }
-+
-+ if (! g_file_test ("/var/run/smolt_do_opensuse_run",
G_FILE_TEST_EXISTS)) {
-+ g_debug ("don't collect hardware info yet until smolt is
updated - BNC#450105");
-+ return TRUE;
-+ }
-+ if (! g_file_test ("/usr/bin/smoltGui", G_FILE_TEST_EXISTS)) {
-+ g_debug ("don't collect hardware info because smoltGui is not
installed");
-+ return FALSE;
-+ }
-+
-+ summary = g_strdup_printf ("%s", _("openSUSE Updater"));
-+ //body = g_strdup_printf ("%s", _("Driver development is prioritized
based on hardware popularity.<br>Please send your system profile to influence
this work."));
-+ body = g_strdup_printf ("%s", _("Driver development is prioritized
based on hardware popularity. Please send your system profile to influence this
work."));
-+ //body2 = g_markup_escape_text (body, -1);
-+ notification = notify_notification_new (summary, body, "help-browser");
-+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
-+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
-+ notify_notification_add_action (notification,
GPK_UPDATE_HARDWARE_SEND_ACTION,
-+ _("Send now"), gpk_update_libnotify_cb, NULL, NULL);
-+ notify_notification_add_action (notification,
GPK_UPDATE_HARDWARE_DONT_PROMPT_ACTION,
-+ _("Do not show this again"), gpk_update_libnotify_cb,
NULL, NULL);
-+ ret = notify_notification_show (notification, &error);
-+ if (!ret) {
-+ g_warning ("error: %s", error->message);
-+ g_error_free (error);
-+ }
-+
-+ g_free (summary);
-+ g_free (body);
-+ return FALSE;
++ NotifyNotification *notification;
++ GError *error = NULL;
++ gchar *body, *summary;
++ //gchar *body2;
++ gboolean ret;
++
++ asked_to_collect = g_settings_get_boolean
(manager->priv->settings_gsd, GSD_SETTINGS_HARDWARE_ASKED_TO_COLLECT);
++
++ if (asked_to_collect) {
++ g_debug ("don't collect hardware info because already done");
++ return FALSE;
++ }
++
++ if (! g_file_test ("/var/run/smolt_do_opensuse_run",
G_FILE_TEST_EXISTS)) {
++ g_debug ("don't collect hardware info yet until smolt is
updated - BNC#450105");
++ return TRUE;
++ }
++ if (! g_file_test ("/usr/bin/smoltGui", G_FILE_TEST_EXISTS)) {
++ g_debug ("don't collect hardware info because smoltGui is not
installed");
++ return FALSE;
++ }
++
++ summary = g_strdup_printf ("%s", _("openSUSE Updater"));
++ //body = g_strdup_printf ("%s", _("Driver development is prioritized
based on hardware popularity.<br>Please send your system profile to influence
this work."));
++ body = g_strdup_printf ("%s", _("Driver development is prioritized
based on hardware popularity. Please send your system profile to influence this
work."));
++ //body2 = g_markup_escape_text (body, -1);
++ notification = notify_notification_new (summary, body, "help-browser");
++ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
++ notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
++ notify_notification_add_action (notification,
GSD_UPDATES_HARDWARE_SEND_ACTION,
++ _("Send now"), gsd_updates_libnotify_cb,
(gpointer)manager, NULL);
++ notify_notification_add_action (notification,
GSD_UPDATES_HARDWARE_DONT_PROMPT_ACTION,
++ _("Do not show this again"), gsd_updates_libnotify_cb,
(gpointer)manager, NULL);
++ ret = notify_notification_show (notification, &error);
++ if (!ret) {
++ g_warning ("error: %s", error->message);
++ g_error_free (error);
++ }
++
++ g_free (summary);
++ g_free (body);
++ return FALSE;
+}
++
+ gboolean
+ gsd_updates_manager_start (GsdUpdatesManager *manager,
+ GError **error)
+@@ -1406,6 +1483,8 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
+ (GAsyncReadyCallback) on_bus_gotten,
+ manager);
- /**
- * gpk_icon_timed_exit_cb:
-@@ -70,11 +142,14 @@ gpk_icon_startup_cb (GtkApplication *app
- watch = gpk_watch_new ();
- firmware = gpk_firmware_new ();
- hardware = gpk_hardware_new ();
-+ settings = g_settings_new (GPK_SETTINGS_SCHEMA);
-
- /* Only timeout if we have specified iton the command line */
- if (timed_exit) {
- timer_id = g_timeout_add_seconds (120, (GSourceFunc)
gpk_icon_timed_exit_cb, application);
- g_source_set_name_by_id (timer_id, "[GpkUpdateIcon] timed
exit");
-+ } else {
-+ g_timeout_add_seconds (5 * 60,
check_for_collect_hardware_information, NULL);
- }
- }
-
-Index: gnome-packagekit-2.91.4/data/org.gnome.packagekit.gschema.migrate
-===================================================================
---- gnome-packagekit-2.91.4.orig/data/org.gnome.packagekit.gschema.migrate
-+++ gnome-packagekit-2.91.4/data/org.gnome.packagekit.gschema.migrate
-@@ -45,4 +45,4 @@ dbus-default-interaction = /apps/gnome-p
- dbus-enforced-interaction = /apps/gnome-packagekit/dbus_enforced_interaction
- install-root = /apps/gnome-packagekit/install_root
- media-repo-filenames = /apps/gnome-packagekit/media_repo_filenames
--
-+updater-asked-to-collect-hardware-information =
/apps/gnome-packagekit/updater_asked_to_collect_hardware_information
-Index: gnome-packagekit-2.91.4/src/gpk-common.h
-===================================================================
---- gnome-packagekit-2.91.4.orig/src/gpk-common.h
-+++ gnome-packagekit-2.91.4/src/gpk-common.h
-@@ -53,6 +53,7 @@ G_BEGIN_DECLS
- #define GPK_SETTINGS_FREQUENCY_GET_UPDATES "frequency-get-updates"
- #define GPK_SETTINGS_FREQUENCY_GET_UPGRADES "frequency-get-upgrades"
- #define GPK_SETTINGS_FREQUENCY_REFRESH_CACHE
"frequency-refresh-cache"
-+#define GPK_SETTINGS_HARDWARE_ASKED_TO_COLLECT
"updater-asked-to-collect-hardware-information"
- #define GPK_SETTINGS_IGNORED_DBUS_REQUESTS "ignored-dbus-requests"
- #define GPK_SETTINGS_IGNORED_DEVICES "ignored-devices"
- #define GPK_SETTINGS_IGNORED_MESSAGES "ignored-messages"
++ g_timeout_add_seconds (5 * 60,
check_for_collect_hardware_information, manager);
++
+ /* success */
+ ret = TRUE;
+ g_debug ("Started updates manager");
++++++ gnome-settings-daemon-3.1.4.tar.bz2 ->
gnome-settings-daemon-3.1.91.tar.bz2 ++++++
++++ 39251 lines of diff (skipped)
++++++ gnome-settings-daemon-bnc462640-mute-action.patch ++++++
--- /var/tmp/diff_new_pack.TY0l1M/_old 2011-09-09 11:20:06.000000000 +0200
+++ /var/tmp/diff_new_pack.TY0l1M/_new 2011-09-09 11:20:06.000000000 +0200
@@ -1,61 +1,52 @@
-Index: data/apps_gnome_settings_daemon_keybindings.schemas.in
-===================================================================
---- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig
-+++ data/apps_gnome_settings_daemon_keybindings.schemas.in
-@@ -25,6 +25,17 @@
- </schema>
-
- <schema>
-+ <key>/schemas/apps/gnome_settings_daemon/toggle_mute</key>
-+ <applyto>/apps/gnome_settings_daemon/toggle_mute</applyto>
-+ <type>bool</type>
-+ <default>TRUE</default>
-+ <locale name="C">
-+ <short>Toggle Mute</short>
-+ <long>Toggle the sound mixer's mute status when then mute
button is pressed.</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-
<key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
-
<applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
- <type>string</type>
Index: plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- plugins/media-keys/gsd-media-keys-manager.c.orig
+++ plugins/media-keys/gsd-media-keys-manager.c
-@@ -681,9 +681,11 @@ do_sound_action (GsdMediaKeysManager *ma
- int type)
+@@ -637,6 +637,7 @@ do_sound_action (GsdMediaKeysManager *ma
+ gboolean quiet)
{
- gboolean muted;
+ gboolean old_muted, new_muted;
+ gboolean toggle_mute;
- guint vol, norm_vol_step;
- int vol_step;
+ guint old_vol, new_vol, norm_vol_step;
gboolean sound_changed;
-+ GError *error;
- if (manager->priv->stream == NULL)
- return;
-@@ -704,7 +706,21 @@ do_sound_action (GsdMediaKeysManager *ma
+@@ -653,7 +654,11 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) {
case MUTE_KEY:
-- muted = !muted;
-+ error = NULL;
-+ toggle_mute = gconf_client_get_bool
(manager->priv->conf_client,
-+ GCONF_MISC_DIR
"/toggle_mute",
-+ &error);
-+
-+ if (error) {
-+ toggle_mute = TRUE;
-+ g_error_free (error);
-+ }
-+
+- new_muted = !old_muted;
++ toggle_mute = g_settings_get_boolean
(manager->priv->settings, "toggle-mute");
+ if (toggle_mute)
-+ muted = !muted;
++ new_muted = !old_muted;
+ else
-+ muted = TRUE;
-+
- gvc_mixer_stream_change_is_muted (manager->priv->stream,
muted);
- sound_changed = TRUE;
++ new_muted = TRUE;
break;
+ case VOLUME_DOWN_KEY:
+ if (old_vol <= norm_vol_step) {
+Index: data/gnome-settings-daemon.convert
+===================================================================
+--- data/gnome-settings-daemon.convert.orig
++++ data/gnome-settings-daemon.convert
+@@ -66,6 +66,7 @@ volume-down = /apps/gnome_settings_daemo
+ volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
+ volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
+ www = /apps/gnome_settings_daemon/keybindings/www
++toggle-mute = /apps/gnome_settings_daemon/toggle_mute
+
+ [org.gnome.settings-daemon.plugins.mouse]
+ active = /apps/gnome_settings_daemon/plugins/mouse/active
+Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+===================================================================
+--- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig
++++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -145,5 +145,10 @@
+ <_summary>Magnifier zoom out</_summary>
+ <_description>Binding for the magnifier to zoom out</_description>
+ </key>
++ <key name="toggle-mute" type="b">
++ <default>true</default>
++ <_summary>Toggle Mute</_summary>
++ <_description>Toggle the sound mixer's mute status when then mute
button is pressed.</_description>
++ </key>
+ </schema>
+ </schemalist>
++++++ gnome-settings-daemon-stop-reload-proxy-settings.patch ++++++
diff --git a/plugins/updates/gsd-updates-manager.c
b/plugins/updates/gsd-updates-manager.c
index a81aa1f..5c193e9 100644
--- a/plugins/updates/gsd-updates-manager.c
+++ b/plugins/updates/gsd-updates-manager.c
@@ -995,6 +995,7 @@ set_proxy_cb (GObject *object, GAsyncResult *res, gpointer
user_data)
static void
reload_proxy_settings (GsdUpdatesManager *manager)
{
+#if 0
gchar *proxy_http;
gchar *proxy_ftp;
@@ -1011,6 +1012,7 @@ reload_proxy_settings (GsdUpdatesManager *manager)
g_free (proxy_http);
g_free (proxy_ftp);
+#endif
}
static void
++++++ gnome-settings-daemon-system-proxy-configuration.diff ++++++
++++ 696 lines (skipped)
++++ between
GNOME/gnome-settings-daemon/gnome-settings-daemon-system-proxy-configuration.diff
++++ and
/mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon-system-proxy-configuration.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
