Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2017-01-19 10:36:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2016-10-18 10:34:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2017-01-19 10:36:53.375991287 +0100
@@ -1,0 +2,20 @@
+Fri Jan 13 21:41:44 UTC 2017 - [email protected]
+
+- Apply gnome-settings-daemon-initial-keyboard.patch also for
+ openSUSE, this fix is also needed there (boo#1009515).
+
+-------------------------------------------------------------------
+Fri Jan 13 21:41:43 UTC 2017 - [email protected]
+
+- Also apply gnome-settings-daemon-more-power-button-actions.patch
+ on openSUSE.
+- Fixup gnome-settings-daemon-bring-back-updates-plugin.patch: also
+ backport pk-clear-offline-update from PackageKit into this patch.
+
+-------------------------------------------------------------------
+Wed Nov 16 01:12:33 UTC 2016 - [email protected]
+
+- Add gnome-settings-daemon-shutdown-dialog-delay.patch: Fix
+ 'Shutdown dialog delay 1 to 2 seconds' (bsc#979257, bgo#774452).
+
+-------------------------------------------------------------------
New:
----
gnome-settings-daemon-shutdown-dialog-delay.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.k4qiPC/_old 2017-01-19 10:36:53.943911183 +0100
+++ /var/tmp/diff_new_pack.k4qiPC/_new 2017-01-19 10:36:53.947910619 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-settings-daemon
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,12 +45,14 @@
Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch
bnc#869685 bgo#710904 [email protected] -- monitor off timeout is too short,
extends it to 5 min
Patch24: gnome-settings-daemon-sle-configure-timeout-blank.patch
-# PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc#979051
[email protected] -- Deal with the default keyboard being set from xkb instead
of GNOME
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051
boo#1009515 [email protected] -- Deal with the default keyboard being set from
xkb instead of GNOME
Patch29: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch
bsc#991024 [email protected] -- Add the updates plugin back
Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch
bsc#996342 [email protected] -- Bring back the "shutdown" and "interactive"
power button actions.
Patch32: gnome-settings-daemon-more-power-button-actions.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-shutdown-dialog-delay.patch
bgo#774452 [email protected] -- Shutdown dialog delay 1 to 2 seconds.
+Patch33: gnome-settings-daemon-shutdown-dialog-delay.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gtk-doc
@@ -158,12 +160,13 @@
%patch21 -p1
%patch22 -p1
%patch24 -p0
-%patch29 -p1
%endif
+%patch29 -p1
%if 0%{?suse_version} == 1315
%patch31 -p1
-%patch32 -p1
%endif
+%patch32 -p1
+%patch33 -p1
%build
%if 0%{?suse_version} == 1315
@@ -263,6 +266,7 @@
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
%if 0%{?suse_version} == 1315
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
+%{_libexecdir}/gnome-settings-daemon-3.0/pk-clear-offline-update
%endif
%{_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
++++++ gnome-settings-daemon-bring-back-updates-plugin.patch ++++++
--- /var/tmp/diff_new_pack.k4qiPC/_old 2017-01-19 10:36:53.975906670 +0100
+++ /var/tmp/diff_new_pack.k4qiPC/_new 2017-01-19 10:36:53.975906670 +0100
@@ -38,11 +38,11 @@
create mode 100644 plugins/updates/updates-design.svg
create mode 100644 plugins/updates/updates.gnome-settings-plugin.in
-Index: gnome-settings-daemon-3.20.1/configure.ac
+Index: gnome-settings-daemon-3.22.1/configure.ac
===================================================================
---- gnome-settings-daemon-3.20.1.orig/configure.ac
-+++ gnome-settings-daemon-3.20.1/configure.ac
-@@ -297,6 +297,33 @@ esac
+--- gnome-settings-daemon-3.22.1.orig/configure.ac
++++ gnome-settings-daemon-3.22.1/configure.ac
+@@ -288,6 +288,33 @@ esac
AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
dnl ==============================================
@@ -76,7 +76,7 @@
dnl smartcard section
dnl ==============================================
have_smartcard_support=false
-@@ -542,6 +569,7 @@ plugins/screensaver-proxy/Makefile
+@@ -533,6 +560,7 @@ plugins/screensaver-proxy/Makefile
plugins/sharing/Makefile
plugins/smartcard/Makefile
plugins/sound/Makefile
@@ -84,7 +84,7 @@
plugins/wacom/Makefile
plugins/xrandr/Makefile
plugins/xsettings/Makefile
-@@ -558,6 +586,7 @@ data/org.gnome.settings-daemon.plugins.m
+@@ -549,6 +577,7 @@ data/org.gnome.settings-daemon.plugins.m
data/org.gnome.settings-daemon.peripherals.gschema.xml.in
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in
@@ -92,18 +92,18 @@
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
-@@ -593,6 +622,7 @@ echo "
- LCMS DICT support: ${have_new_lcms}
+@@ -583,6 +612,7 @@ echo "
+
NetworkManager support: ${enable_network_manager}
Libnotify support: ${have_libnotify}
+ PackageKit support: ${have_packagekit}
Smartcard support: ${have_smartcard_support}
Cups support: ${enable_cups}
Wacom support: ${have_wacom}
-Index: gnome-settings-daemon-3.20.1/data/Makefile.am
+Index: gnome-settings-daemon-3.22.1/data/Makefile.am
===================================================================
---- gnome-settings-daemon-3.20.1.orig/data/Makefile.am
-+++ gnome-settings-daemon-3.20.1/data/Makefile.am
+--- gnome-settings-daemon-3.22.1.orig/data/Makefile.am
++++ gnome-settings-daemon-3.22.1/data/Makefile.am
@@ -19,6 +19,7 @@ gsettings_SCHEMAS =
\
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
\
@@ -112,10 +112,10 @@
org.gnome.settings-daemon.plugins.orientation.gschema.xml \
org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-Index:
gnome-settings-daemon-3.20.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+Index:
gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
===================================================================
--- /dev/null
-+++
gnome-settings-daemon-3.20.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++
gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
@@ -0,0 +1,79 @@
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@"
id="org.gnome.settings-daemon.plugins.updates"
path="/org/gnome/settings-daemon/plugins/updates/">
@@ -196,10 +196,10 @@
+ </key>
+ </schema>
+</schemalist>
-Index: gnome-settings-daemon-3.20.1/plugins/Makefile.am
+Index: gnome-settings-daemon-3.22.1/plugins/Makefile.am
===================================================================
---- gnome-settings-daemon-3.20.1.orig/plugins/Makefile.am
-+++ gnome-settings-daemon-3.20.1/plugins/Makefile.am
+--- gnome-settings-daemon-3.22.1.orig/plugins/Makefile.am
++++ gnome-settings-daemon-3.22.1/plugins/Makefile.am
@@ -22,6 +22,12 @@ enabled_plugins = \
disabled_plugins = $(NULL)
@@ -213,11 +213,11 @@
if SMARTCARD_SUPPORT
enabled_plugins += smartcard
else
-Index: gnome-settings-daemon-3.20.1/plugins/updates/Makefile.am
+Index: gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/Makefile.am
-@@ -0,0 +1,93 @@
++++ gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
+@@ -0,0 +1,98 @@
+plugin_name = updates
+
+plugin_LTLIBRARIES = \
@@ -264,7 +264,12 @@
+
+plugin_DATA =
$(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+
-+libexec_PROGRAMS = gsd-test-updates
++libexec_PROGRAMS = gsd-test-updates pk-clear-offline-update
++
++pk_clear_offline_update_SOURCES = pk-offline-clear-update.c \
++ gsd-updates-common.h
++
++pk_clear_offline_update_CFLAGS = $(SETTINGS_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
+
+gsd_test_updates_SOURCES = \
+ test-updates.c \
@@ -311,11 +316,11 @@
+ $(plugin_DATA)
+
+@GSD_INTLTOOL_PLUGIN_RULE@
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-common.h
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-common.h
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-common.h
-@@ -0,0 +1,44 @@
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-common.h
+@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2011 Richard Hughes <[email protected]>
@@ -339,6 +344,7 @@
+
+#ifndef __GSD_UPDATES_COMMON_H
+#define __GSD_UPDATES_COMMON_H
++#include <glib.h>
+
+G_BEGIN_DECLS
+
@@ -357,13 +363,14 @@
+#define GSD_SETTINGS_UPDATE_BATTERY "update-battery"
+#define GSD_SETTINGS_AUTO_DOWNLOAD_UPDATES
"auto-download-updates"
+
++#define PK_OFFLINE_UPDATE_RESULTS_FILENAME
"/var/lib/PackageKit/offline-update-competed"
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_COMMON_H */
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-firmware.c
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.c
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-firmware.c
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.c
@@ -0,0 +1,1040 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1405,10 +1412,10 @@
+ firmware = g_object_new (GSD_UPDATES_TYPE_FIRMWARE, NULL);
+ return GSD_UPDATES_FIRMWARE (firmware);
+}
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-firmware.h
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.h
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-firmware.h
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1462,11 +1469,11 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_FIRMWARE_H */
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.c
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c
-@@ -0,0 +1,1510 @@
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.c
+@@ -0,0 +1,1509 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2011 Richard Hughes <[email protected]>
@@ -2617,7 +2624,6 @@
+}
+
+#define PK_OFFLINE_UPDATE_RESULTS_GROUP "PackageKit Offline
Update Results"
-+#define PK_OFFLINE_UPDATE_RESULTS_FILENAME
"/var/lib/PackageKit/offline-update-competed"
+
+static gboolean
+check_offline_update_cb (gpointer user_data)
@@ -2977,10 +2983,10 @@
+
+ return GSD_UPDATES_MANAGER (manager_object);
+}
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.h
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.h
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.h
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -3038,10 +3044,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_MANAGER_H */
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-plugin.c
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-plugin.c
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-plugin.c
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-plugin.c
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -3071,10 +3077,10 @@
+#include "gsd-updates-manager.h"
+
+GNOME_SETTINGS_PLUGIN_REGISTER (GsdUpdates, gsd_updates)
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-refresh.c
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.c
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-refresh.c
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.c
@@ -0,0 +1,573 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -3649,10 +3655,10 @@
+ return GSD_UPDATES_REFRESH (refresh);
+}
+
-Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-refresh.h
+Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.h
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-refresh.h
++++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -3706,10 +3712,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_REFRESH_H */
-Index: gnome-settings-daemon-3.20.1/plugins/updates/test-updates.c
+Index: gnome-settings-daemon-3.22.1/plugins/updates/test-updates.c
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/test-updates.c
++++ gnome-settings-daemon-3.22.1/plugins/updates/test-updates.c
@@ -0,0 +1,7 @@
+#define NEW gsd_updates_manager_new
+#define START gsd_updates_manager_start
@@ -3718,10 +3724,10 @@
+#include "gsd-updates-manager.h"
+
+#include "test-plugin.h"
-Index: gnome-settings-daemon-3.20.1/plugins/updates/updates-design.svg
+Index: gnome-settings-daemon-3.22.1/plugins/updates/updates-design.svg
===================================================================
--- /dev/null
-+++ gnome-settings-daemon-3.20.1/plugins/updates/updates-design.svg
++++ gnome-settings-daemon-3.22.1/plugins/updates/updates-design.svg
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -4488,10 +4494,10 @@
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
-Index:
gnome-settings-daemon-3.20.1/plugins/updates/updates.gnome-settings-plugin.in
+Index:
gnome-settings-daemon-3.22.1/plugins/updates/updates.gnome-settings-plugin.in
===================================================================
--- /dev/null
-+++
gnome-settings-daemon-3.20.1/plugins/updates/updates.gnome-settings-plugin.in
++++
gnome-settings-daemon-3.22.1/plugins/updates/updates.gnome-settings-plugin.in
@@ -0,0 +1,9 @@
+[GNOME Settings Plugin]
+Module=updates
@@ -4502,10 +4508,10 @@
+Authors=Richard Hughes
+Copyright=Copyright © 2011
+Website=
-Index: gnome-settings-daemon-3.20.1/po/POTFILES.in
+Index: gnome-settings-daemon-3.22.1/po/POTFILES.in
===================================================================
---- gnome-settings-daemon-3.20.1.orig/po/POTFILES.in
-+++ gnome-settings-daemon-3.20.1/po/POTFILES.in
+--- gnome-settings-daemon-3.22.1.orig/po/POTFILES.in
++++ gnome-settings-daemon-3.22.1/po/POTFILES.in
@@ -13,6 +13,7 @@ data/org.gnome.settings-daemon.plugins.o
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
@@ -4524,10 +4530,10 @@
plugins/wacom/gsd-wacom-button-editor.c
plugins/wacom/gsd-wacom-device.c
plugins/wacom/gsd-wacom-key-shortcut-button.c
-Index: gnome-settings-daemon-3.20.1/po/POTFILES.skip
+Index: gnome-settings-daemon-3.22.1/po/POTFILES.skip
===================================================================
---- gnome-settings-daemon-3.20.1.orig/po/POTFILES.skip
-+++ gnome-settings-daemon-3.20.1/po/POTFILES.skip
+--- gnome-settings-daemon-3.22.1.orig/po/POTFILES.skip
++++ gnome-settings-daemon-3.22.1/po/POTFILES.skip
@@ -19,6 +19,7 @@ data/org.gnome.settings-daemon.plugins.o
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
@@ -4536,10 +4542,10 @@
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
plugins/automount/gnome-fallback-mount-helper.desktop.in
-Index:
gnome-settings-daemon-3.20.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+Index:
gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
===================================================================
----
gnome-settings-daemon-3.20.1.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
-+++
gnome-settings-daemon-3.20.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+---
gnome-settings-daemon-3.22.1.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
++++
gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -26,6 +26,7 @@
<child name="sharing" schema="org.gnome.settings-daemon.plugins.sharing"/>
<child name="smartcard"
schema="org.gnome.settings-daemon.plugins.smartcard"/>
@@ -4548,3 +4554,58 @@
<child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
<child name="xsettings"
schema="org.gnome.settings-daemon.plugins.xsettings"/>
</schema>
+Index: gnome-settings-daemon-3.22.1/plugins/updates/pk-offline-clear-update.c
+===================================================================
+--- /dev/null
++++ gnome-settings-daemon-3.22.1/plugins/updates/pk-offline-clear-update.c
+@@ -0,0 +1,50 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2012 Richard Hughes <[email protected]>
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
++ */
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++/* Header needed for the location of PK_OFFLINE_UPDATE_RESULTS_FILENAME */
++#include "gsd-updates-common.h"
++
++int
++main (int argc, char *argv[])
++{
++ int rc;
++
++ /* ensure root user */
++ if (getuid () != 0 || geteuid () != 0) {
++ fprintf (stderr, "This program can only be used using
pkexec\n");
++ return EXIT_FAILURE;
++ }
++
++ /* Just delete the file, no questions asked :) */
++ rc = unlink (PK_OFFLINE_UPDATE_RESULTS_FILENAME);
++ if (rc < 0) {
++ fprintf (stderr, "Failed to remove file: %s\n", strerror
(errno));
++ return EXIT_FAILURE;
++ }
++ return EXIT_SUCCESS;
++}
++
++++++ gnome-settings-daemon-shutdown-dialog-delay.patch ++++++
>From 21fb652101fbf81d16f76178da9614dcd547686a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Thu, 17 Nov 2016 14:03:37 +0100
Subject: media-keys: Fix shutdown dialog delay when using kbd shortcut
After pressing the Ctrl+Alt+Del shortcut, the shutdown dialog doesn't
appear on screen for a couple of seconds.
The media-keys daemon calls the 'Shutdown' method synchronously. After that
gnome-session calls the daemon with 'QueryEndSession'. The daemon cannot
reply as it's blocked waiting for the reply to the Shutdown method.
Sending the message asynchronously fixes that delay.
Based on report by Xiaoguang Wang <[email protected]>
https://bugzilla.gnome.org/show_bug.cgi?id=774452
---
plugins/media-keys/gsd-media-keys-manager.c | 46 +++++++++++++++++++----------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/plugins/media-keys/gsd-media-keys-manager.c
b/plugins/media-keys/gsd-media-keys-manager.c
index aec094b..c178752 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -813,26 +813,42 @@ do_media_action (GsdMediaKeysManager *manager,
}
static void
+gnome_session_shutdown_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GVariant *result;
+ GError *error = NULL;
+
+ result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+ res,
+ &error);
+ if (result == NULL) {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ g_warning ("Failed to call Shutdown on session
manager: %s",
+ error->message);
+ g_error_free (error);
+ } else {
+ g_variant_unref (result);
+ }
+}
+
+static void
gnome_session_shutdown (GsdMediaKeysManager *manager)
{
- GError *error = NULL;
- GVariant *variant;
GDBusProxy *proxy;
proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
- variant = g_dbus_proxy_call_sync (proxy,
- "Shutdown",
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
- if (variant == NULL) {
- g_warning ("Failed to call Shutdown on session manager: %s",
error->message);
- g_error_free (error);
- return;
- }
- g_variant_unref (variant);
+
+ g_dbus_proxy_call (proxy,
+ "Shutdown",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ manager->priv->bus_cancellable,
+ gnome_session_shutdown_cb,
+ NULL);
+
g_object_unref (proxy);
}
--
cgit v0.12
