Accepting request 434723 from GNOME:Next

- Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix
  updates notification not popping up in openSUSE (bsc#1004343).

- Update to version 3.22.1:
  + Power: Ensure we blank the screen when locked.
  + Sharing: Fix crash on exit.
  + Wacom: Avoid warnings when switching VTs.
  + Updated translations.

OBS-URL: https://build.opensuse.org/request/show/434723
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=263
This commit is contained in:
Bjørn Lie 2016-10-14 19:28:38 +00:00 committed by Git OBS Bridge
parent 9008fdfa13
commit 12d9c6d711
5 changed files with 26 additions and 22 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b
size 1649924

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba
size 1622420

View File

@ -1466,7 +1466,7 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c +++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
@@ -0,0 +1,1521 @@ @@ -0,0 +1,1510 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
+ * Copyright (C) 2011 Richard Hughes <richard@hughsie.com> + * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
@ -1677,12 +1677,6 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
+ g_string_free (msg, TRUE); + g_string_free (msg, TRUE);
+} +}
+ +
+static gboolean
+does_gnome_software_exist (void)
+{
+ return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
+}
+
+static void +static void
+libnotify_action_cb (NotifyNotification *notification, +libnotify_action_cb (NotifyNotification *notification,
+ gchar *action, + gchar *action,
@ -2849,11 +2843,8 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
+ G_CALLBACK (due_get_upgrades_cb), manager); + G_CALLBACK (due_get_upgrades_cb), manager);
+ g_signal_connect (manager->priv->refresh, "refresh-cache", + g_signal_connect (manager->priv->refresh, "refresh-cache",
+ G_CALLBACK (due_refresh_cache_cb), manager); + G_CALLBACK (due_refresh_cache_cb), manager);
+ /* gnome-software takes over software updates if it's installed */ + g_signal_connect (manager->priv->refresh, "get-updates",
+ if (!does_gnome_software_exist ()) { + G_CALLBACK (due_get_updates_cb), manager);
+ g_signal_connect (manager->priv->refresh, "get-updates",
+ G_CALLBACK (due_get_updates_cb), manager);
+ }
+ +
+ /* get proxy settings */ + /* get proxy settings */
+ manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy"); + manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy");
@ -2900,12 +2891,10 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
+ reload_proxy_settings (manager); + reload_proxy_settings (manager);
+ +
+ /* check for offline update */ + /* check for offline update */
+ if (!does_gnome_software_exist ()) { + manager->priv->offline_update_id =
+ manager->priv->offline_update_id = + g_timeout_add_seconds (GSD_UPDATES_CHECK_OFFLINE_TIMEOUT,
+ g_timeout_add_seconds (GSD_UPDATES_CHECK_OFFLINE_TIMEOUT, + check_offline_update_cb,
+ check_offline_update_cb, + manager);
+ manager);
+ }
+ +
+ /* success */ + /* success */
+ ret = TRUE; + ret = TRUE;

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Oct 13 10:46:18 UTC 2016 - sckang@suse.com
- Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix
updates notification not popping up in openSUSE (bsc#1004343).
-------------------------------------------------------------------
Tue Oct 11 11:46:37 UTC 2016 - zaitor@opensuse.org
- Update to version 3.22.1:
+ Power: Ensure we blank the screen when locked.
+ Sharing: Fix crash on exit.
+ Wacom: Avoid warnings when switching VTs.
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 27 17:50:39 UTC 2016 - zaitor@opensuse.org Tue Sep 27 17:50:39 UTC 2016 - zaitor@opensuse.org

View File

@ -30,7 +30,7 @@
%endif %endif
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 3.22.0 Version: 3.22.1
Release: 0 Release: 0
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+ License: GPL-2.0+