Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2013-11-24 11:54:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-10-17 14:09:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2013-11-24 11:54:09.000000000 +0100
@@ -1,0 +2,16 @@
+Tue Nov 12 19:38:35 UTC 2013 - [email protected]
+
+- Update to version 3.10.2 (bnc#849913):
+ + Media-keys:
+ - Fix 2nd MPRIS client never being used.
+ - Make "Pause" work for MPRIS clients.
+ - Make the "shutdown" action not be interactive.
+ - Allow the power key in more places.
+ + Power:
+ - Fix time to empty with multiple batteries.
+ + XRandR:
+ - Prevent possible overflows handling timestamps.
+ + XSettings:
+ - Unwatch dbus before destroying xsettings managers.
+
+-------------------------------------------------------------------
Old:
----
gnome-settings-daemon-3.10.1.tar.xz
New:
----
gnome-settings-daemon-3.10.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.0TLTlL/_old 2013-11-24 11:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.0TLTlL/_new 2013-11-24 11:54:10.000000000 +0100
@@ -34,7 +34,7 @@
%endif
Name: gnome-settings-daemon
-Version: 3.10.1
+Version: 3.10.2
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
++++++ gnome-settings-daemon-3.10.1.tar.xz ->
gnome-settings-daemon-3.10.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.10.1/Makefile.in
new/gnome-settings-daemon-3.10.2/Makefile.in
--- old/gnome-settings-daemon-3.10.1/Makefile.in 2013-10-15
22:31:29.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/Makefile.in 2013-11-12
20:07:45.000000000 +0100
@@ -83,7 +83,7 @@
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in COPYING COPYING.LIB compile config.guess \
- config.sub install-sh missing ltmain.sh
+ config.sub depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.10.1/NEWS
new/gnome-settings-daemon-3.10.2/NEWS
--- old/gnome-settings-daemon-3.10.1/NEWS 2013-10-15 22:29:50.000000000
+0200
+++ new/gnome-settings-daemon-3.10.2/NEWS 2013-11-12 20:06:10.000000000
+0100
@@ -1,4 +1,23 @@
==============
+Version 3.10.2
+==============
+
+Media-keys:
+- Fix 2nd MPRIS client never being used
+- Make "Pause" work for MPRIS clients
+- Make the "shutdown" action not be interactive
+- Allow the power key in more places
+
+Power:
+- Fix time to empty with multiple batteries
+
+XRandR:
+- Prevent possible overflows handling timestamps
+
+XSettings:
+- Unwatch dbus before destroying xsettings managers
+
+==============
Version 3.10.1
==============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.10.1/aclocal.m4
new/gnome-settings-daemon-3.10.2/aclocal.m4
--- old/gnome-settings-daemon-3.10.1/aclocal.m4 2013-10-15 22:31:27.000000000
+0200
+++ new/gnome-settings-daemon-3.10.2/aclocal.m4 2013-11-12 20:07:44.000000000
+0100
@@ -1541,7 +1541,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1555,7 +1555,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1574,7 +1577,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.10.1/configure
new/gnome-settings-daemon-3.10.2/configure
--- old/gnome-settings-daemon-3.10.1/configure 2013-10-15 22:31:28.000000000
+0200
+++ new/gnome-settings-daemon-3.10.2/configure 2013-11-12 20:07:45.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-settings-daemon 3.10.1.
+# Generated by GNU Autoconf 2.69 for gnome-settings-daemon 3.10.2.
#
# Report bugs to
<http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-settings-daemon'
PACKAGE_TARNAME='gnome-settings-daemon'
-PACKAGE_VERSION='3.10.1'
-PACKAGE_STRING='gnome-settings-daemon 3.10.1'
+PACKAGE_VERSION='3.10.2'
+PACKAGE_STRING='gnome-settings-daemon 3.10.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon'
PACKAGE_URL=''
@@ -1538,7 +1538,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnome-settings-daemon 3.10.1 to adapt to many kinds of
systems.
+\`configure' configures gnome-settings-daemon 3.10.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1609,7 +1609,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-settings-daemon
3.10.1:";;
+ short | recursive ) echo "Configuration of gnome-settings-daemon
3.10.2:";;
esac
cat <<\_ACEOF
@@ -1832,7 +1832,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-settings-daemon configure 3.10.1
+gnome-settings-daemon configure 3.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2322,7 +2322,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-settings-daemon $as_me 3.10.1, which was
+It was created by gnome-settings-daemon $as_me 3.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3188,7 +3188,7 @@
# Define the identity of the package.
PACKAGE='gnome-settings-daemon'
- VERSION='3.10.1'
+ VERSION='3.10.2'
cat >>confdefs.h <<_ACEOF
@@ -7576,7 +7576,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7594,7 +7594,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7613,7 +7616,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -21516,7 +21522,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-settings-daemon $as_me 3.10.1, which was
+This file was extended by gnome-settings-daemon $as_me 3.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21582,7 +21588,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-settings-daemon config.status 3.10.1
+gnome-settings-daemon config.status 3.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.10.1/configure.ac
new/gnome-settings-daemon-3.10.2/configure.ac
--- old/gnome-settings-daemon-3.10.1/configure.ac 2013-10-15
22:12:18.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/configure.ac 2013-11-12
20:02:04.000000000 +0100
@@ -1,7 +1,7 @@
AC_PREREQ([2.60])
AC_INIT([gnome-settings-daemon],
- [3.10.1],
+ [3.10.2],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/media-keys/gsd-media-keys-manager.c
new/gnome-settings-daemon-3.10.2/plugins/media-keys/gsd-media-keys-manager.c
---
old/gnome-settings-daemon-3.10.1/plugins/media-keys/gsd-media-keys-manager.c
2013-10-15 21:52:49.000000000 +0200
+++
new/gnome-settings-daemon-3.10.2/plugins/media-keys/gsd-media-keys-manager.c
2013-11-12 15:58:31.000000000 +0100
@@ -1807,23 +1807,13 @@
}
static void
-power_action_suspend (GsdMediaKeysManager *manager)
+power_action (GsdMediaKeysManager *manager,
+ const char *action,
+ gboolean allow_interaction)
{
g_dbus_proxy_call (manager->priv->logind_proxy,
- "Suspend",
- g_variant_new ("(b)", TRUE),
- G_DBUS_CALL_FLAGS_NONE,
- G_MAXINT,
- manager->priv->bus_cancellable,
- NULL, NULL);
-}
-
-static void
-power_action_hibernate (GsdMediaKeysManager *manager)
-{
- g_dbus_proxy_call (manager->priv->logind_proxy,
- "Hibernate",
- g_variant_new ("(b)", TRUE),
+ action,
+ g_variant_new ("(b)", allow_interaction),
G_DBUS_CALL_FLAGS_NONE,
G_MAXINT,
manager->priv->bus_cancellable,
@@ -1832,7 +1822,8 @@
static void
do_config_power_action (GsdMediaKeysManager *manager,
- const gchar *config_key)
+ const gchar *config_key,
+ gboolean in_lock_screen)
{
GsdPowerActionType action_type;
@@ -1840,14 +1831,17 @@
config_key);
switch (action_type) {
case GSD_POWER_ACTION_SUSPEND:
- power_action_suspend (manager);
+ power_action (manager, "Suspend", !in_lock_screen);
break;
case GSD_POWER_ACTION_INTERACTIVE:
+ if (!in_lock_screen)
+ gnome_session_shutdown (manager);
+ break;
case GSD_POWER_ACTION_SHUTDOWN:
- gnome_session_shutdown (manager);
+ power_action (manager, "PowerOff", !in_lock_screen);
break;
case GSD_POWER_ACTION_HIBERNATE:
- power_action_hibernate (manager);
+ power_action (manager, "Hibernate", !in_lock_screen);
break;
case GSD_POWER_ACTION_BLANK:
case GSD_POWER_ACTION_LOGOUT:
@@ -2184,16 +2178,28 @@
do_toggle_contrast_action (manager);
break;
case POWER_KEY:
- do_config_power_action (manager, "button-power");
+ do_config_power_action (manager, "button-power", FALSE);
break;
case SLEEP_KEY:
- do_config_power_action (manager, "button-sleep");
+ do_config_power_action (manager, "button-sleep", FALSE);
break;
case SUSPEND_KEY:
- do_config_power_action (manager, "button-suspend");
+ do_config_power_action (manager, "button-suspend", FALSE);
break;
case HIBERNATE_KEY:
- do_config_power_action (manager, "button-hibernate");
+ do_config_power_action (manager, "button-hibernate", FALSE);
+ break;
+ case POWER_KEY_NO_DIALOG:
+ do_config_power_action (manager, "button-power", TRUE);
+ break;
+ case SLEEP_KEY_NO_DIALOG:
+ do_config_power_action (manager, "button-sleep", TRUE);
+ break;
+ case SUSPEND_KEY_NO_DIALOG:
+ do_config_power_action (manager, "button-suspend", TRUE);
+ break;
+ case HIBERNATE_KEY_NO_DIALOG:
+ do_config_power_action (manager, "button-hibernate", TRUE);
break;
case SCREEN_BRIGHTNESS_UP_KEY:
case SCREEN_BRIGHTNESS_DOWN_KEY:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/media-keys/mpris-controller.c
new/gnome-settings-daemon-3.10.2/plugins/media-keys/mpris-controller.c
--- old/gnome-settings-daemon-3.10.1/plugins/media-keys/mpris-controller.c
2013-10-01 10:41:59.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/plugins/media-keys/mpris-controller.c
2013-11-12 15:58:31.000000000 +0100
@@ -83,6 +83,9 @@
if (!priv->mpris_client_proxy)
return FALSE;
+ if (g_strcmp0 (key, "Play") == 0)
+ key = "PlayPause";
+
g_debug ("calling %s over dbus to mpris client %s",
key, g_dbus_proxy_get_name (priv->mpris_client_proxy));
g_dbus_proxy_call (priv->mpris_client_proxy,
@@ -105,6 +108,8 @@
if (!priv->mpris_client_proxy)
g_warning ("Error connecting to mpris interface %s", error->message);
+ priv->connecting = FALSE;
+
g_clear_error (&error);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/media-keys/shortcuts-list.h
new/gnome-settings-daemon-3.10.2/plugins/media-keys/shortcuts-list.h
--- old/gnome-settings-daemon-3.10.1/plugins/media-keys/shortcuts-list.h
2013-10-01 10:41:59.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/plugins/media-keys/shortcuts-list.h
2013-11-12 15:58:31.000000000 +0100
@@ -77,6 +77,10 @@
SLEEP_KEY,
SUSPEND_KEY,
HIBERNATE_KEY,
+ POWER_KEY_NO_DIALOG,
+ SLEEP_KEY_NO_DIALOG,
+ SUSPEND_KEY_NO_DIALOG,
+ HIBERNATE_KEY_NO_DIALOG,
SCREEN_BRIGHTNESS_UP_KEY,
SCREEN_BRIGHTNESS_DOWN_KEY,
KEYBOARD_BRIGHTNESS_UP_KEY,
@@ -90,6 +94,11 @@
#define GSD_KEYBINDING_MODE_LAUNCHER (SHELL_KEYBINDING_MODE_NORMAL | \
SHELL_KEYBINDING_MODE_OVERVIEW)
#define SCREENSAVER_MODE SHELL_KEYBINDING_MODE_ALL &
~SHELL_KEYBINDING_MODE_UNLOCK_SCREEN
+#define POWER_KEYS_MODE (SHELL_KEYBINDING_MODE_NORMAL | \
+ SHELL_KEYBINDING_MODE_OVERVIEW | \
+ SHELL_KEYBINDING_MODE_LOGIN_SCREEN)
+#define POWER_KEYS_MODE_NO_DIALOG (SHELL_KEYBINDING_MODE_LOCK_SCREEN | \
+ SHELL_KEYBINDING_MODE_UNLOCK_SCREEN)
static struct {
MediaKeyType key_type;
@@ -150,12 +159,18 @@
{ TOGGLE_CONTRAST_KEY, "toggle-contrast", NULL, NULL,
SHELL_KEYBINDING_MODE_ALL },
{ MAGNIFIER_ZOOM_IN_KEY, "magnifier-zoom-in", NULL, NULL,
SHELL_KEYBINDING_MODE_ALL },
{ MAGNIFIER_ZOOM_OUT_KEY, "magnifier-zoom-out", NULL, NULL,
SHELL_KEYBINDING_MODE_ALL },
- { POWER_KEY, NULL, N_("Power Off"), "XF86PowerOff",
GSD_KEYBINDING_MODE_LAUNCHER },
+ { POWER_KEY, NULL, N_("Power Off"), "XF86PowerOff", POWER_KEYS_MODE },
/* the kernel / Xorg names really are like this... */
/* translators: "Sleep" means putting the machine to sleep, either
through hibernate or suspend */
- { SLEEP_KEY, NULL, N_("Sleep"), "XF86Suspend",
SHELL_KEYBINDING_MODE_ALL },
- { SUSPEND_KEY, NULL, N_("Suspend"), "XF86Sleep",
SHELL_KEYBINDING_MODE_ALL },
- { HIBERNATE_KEY, NULL, N_("Hibernate"), "XF86Hibernate",
SHELL_KEYBINDING_MODE_ALL },
+ { SLEEP_KEY, NULL, N_("Sleep"), "XF86Suspend", POWER_KEYS_MODE },
+ { SUSPEND_KEY, NULL, N_("Suspend"), "XF86Sleep", POWER_KEYS_MODE },
+ { HIBERNATE_KEY, NULL, N_("Hibernate"), "XF86Hibernate",
POWER_KEYS_MODE },
+ { POWER_KEY_NO_DIALOG, NULL, N_("Power Off"), "XF86PowerOff",
POWER_KEYS_MODE_NO_DIALOG },
+ /* the kernel / Xorg names really are like this... */
+ /* translators: "Sleep" means putting the machine to sleep, either
through hibernate or suspend */
+ { SLEEP_KEY_NO_DIALOG, NULL, N_("Sleep"), "XF86Suspend",
POWER_KEYS_MODE_NO_DIALOG },
+ { SUSPEND_KEY_NO_DIALOG, NULL, N_("Suspend"), "XF86Sleep",
POWER_KEYS_MODE_NO_DIALOG },
+ { HIBERNATE_KEY_NO_DIALOG, NULL, N_("Hibernate"), "XF86Hibernate",
POWER_KEYS_MODE_NO_DIALOG },
{ SCREEN_BRIGHTNESS_UP_KEY, NULL, N_("Brightness Up"),
"XF86MonBrightnessUp", SHELL_KEYBINDING_MODE_ALL },
{ SCREEN_BRIGHTNESS_DOWN_KEY, NULL, N_("Brightness Down"),
"XF86MonBrightnessDown", SHELL_KEYBINDING_MODE_ALL },
{ KEYBOARD_BRIGHTNESS_UP_KEY, NULL, N_("Keyboard Brightness Up"),
"XF86KbdBrightnessUp", SHELL_KEYBINDING_MODE_ALL },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/power/gsd-power-manager.c
new/gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c
--- old/gnome-settings-daemon-3.10.1/plugins/power/gsd-power-manager.c
2013-10-15 21:52:49.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c
2013-11-12 19:33:05.000000000 +0100
@@ -739,11 +739,14 @@
else
state = UP_DEVICE_STATE_UNKNOWN;
+ if (battery_devices == 1)
+ goto out;
+
/* calculate a quick and dirty time remaining value */
if (energy_rate_total > 0) {
- if (state == UP_DEVICE_STATE_DISCHARGING &&
time_to_empty_total == 0)
+ if (state == UP_DEVICE_STATE_DISCHARGING)
time_to_empty_total = 3600 * (energy_total /
energy_rate_total);
- else if (state == UP_DEVICE_STATE_CHARGING &&
time_to_full_total == 0)
+ else if (state == UP_DEVICE_STATE_CHARGING)
time_to_full_total = 3600 * ((energy_full_total -
energy_total) / energy_rate_total);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/xrandr/gsd-xrandr-manager.c
new/gnome-settings-daemon-3.10.2/plugins/xrandr/gsd-xrandr-manager.c
--- old/gnome-settings-daemon-3.10.1/plugins/xrandr/gsd-xrandr-manager.c
2013-10-11 13:36:13.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/plugins/xrandr/gsd-xrandr-manager.c
2013-11-12 15:58:31.000000000 +0100
@@ -134,8 +134,8 @@
GnomeRROutputInfo *output,
int *out_num_rotations,
GnomeRRRotation *out_rotations);
-static void handle_fn_f7 (GsdXrandrManager *mgr, guint32 timestamp);
-static void handle_rotate_windows (GsdXrandrManager *mgr, GnomeRRRotation
rotation, guint32 timestamp);
+static void handle_fn_f7 (GsdXrandrManager *mgr, gint64 timestamp);
+static void handle_rotate_windows (GsdXrandrManager *mgr, GnomeRRRotation
rotation, gint64 timestamp);
G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
@@ -339,7 +339,7 @@
* We just return whether setting the configuration succeeded.
*/
static gboolean
-apply_configuration (GsdXrandrManager *manager, GnomeRRConfig *config, guint32
timestamp)
+apply_configuration (GsdXrandrManager *manager, GnomeRRConfig *config, gint64
timestamp)
{
GsdXrandrManagerPrivate *priv = manager->priv;
GError *error;
@@ -353,7 +353,7 @@
success = gnome_rr_config_apply (config, priv->rw_screen, &error);
if (!success) {
- log_msg ("Could not switch to the following configuration
(timestamp %u): %s\n", timestamp, error->message);
+ log_msg ("Could not switch to the following configuration
(timestamp %" G_GINT64_FORMAT "): %s\n", timestamp, error->message);
log_configuration (config);
g_error_free (error);
}
@@ -364,7 +364,7 @@
/* DBus method for org.gnome.SettingsDaemon.XRANDR_2 VideoModeSwitch; see
gsd-xrandr-manager.xml for the interface definition */
static gboolean
gsd_xrandr_manager_2_video_mode_switch (GsdXrandrManager *manager,
- guint32 timestamp,
+ gint64 timestamp,
GError **error)
{
handle_fn_f7 (manager, timestamp);
@@ -374,7 +374,7 @@
/* DBus method for org.gnome.SettingsDaemon.XRANDR_2 Rotate; see
gsd-xrandr-manager.xml for the interface definition */
static gboolean
gsd_xrandr_manager_2_rotate (GsdXrandrManager *manager,
- guint32 timestamp,
+ gint64 timestamp,
GError **error)
{
handle_rotate_windows (manager, GNOME_RR_ROTATION_NEXT, timestamp);
@@ -385,7 +385,7 @@
static gboolean
gsd_xrandr_manager_2_rotate_to (GsdXrandrManager *manager,
GnomeRRRotation rotation,
- guint32 timestamp,
+ gint64 timestamp,
GError **error)
{
guint i;
@@ -943,7 +943,7 @@
}
static void
-handle_fn_f7 (GsdXrandrManager *mgr, guint32 timestamp)
+handle_fn_f7 (GsdXrandrManager *mgr, gint64 timestamp)
{
GsdXrandrManagerPrivate *priv = mgr->priv;
GnomeRRScreen *screen = priv->rw_screen;
@@ -965,7 +965,7 @@
g_debug ("Handling fn-f7");
log_open ();
- log_msg ("Handling XF86Display hotkey - timestamp %u\n", timestamp);
+ log_msg ("Handling XF86Display hotkey - timestamp %" G_GINT64_FORMAT
"\n", timestamp);
error = NULL;
if (!gnome_rr_screen_refresh (screen, &error) && error) {
@@ -1016,7 +1016,7 @@
success = apply_configuration (mgr,
priv->fn_f7_configs[mgr->priv->current_fn_f7_config], timestamp);
if (success) {
- log_msg ("Successfully switched to configuration
(timestamp %u):\n", timestamp);
+ log_msg ("Successfully switched to configuration
(timestamp %" G_GINT64_FORMAT "):\n", timestamp);
log_configuration
(priv->fn_f7_configs[mgr->priv->current_fn_f7_config]);
}
}
@@ -1204,7 +1204,7 @@
static void
handle_rotate_windows (GsdXrandrManager *mgr,
GnomeRRRotation rotation,
- guint32 timestamp)
+ gint64 timestamp)
{
GsdXrandrManagerPrivate *priv = mgr->priv;
GnomeRRScreen *screen = priv->rw_screen;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.10.1/plugins/xsettings/gsd-xsettings-manager.c
new/gnome-settings-daemon-3.10.2/plugins/xsettings/gsd-xsettings-manager.c
--- old/gnome-settings-daemon-3.10.1/plugins/xsettings/gsd-xsettings-manager.c
2013-10-01 10:41:59.000000000 +0200
+++ new/gnome-settings-daemon-3.10.2/plugins/xsettings/gsd-xsettings-manager.c
2013-11-12 15:58:31.000000000 +0100
@@ -1041,6 +1041,9 @@
g_debug ("Stopping xsettings manager");
+ if (p->shell_name_watch_id > 0)
+ g_bus_unwatch_name (p->shell_name_watch_id);
+
if (p->managers != NULL) {
for (i = 0; p->managers [i]; ++i)
xsettings_manager_destroy (p->managers [i]);
@@ -1056,9 +1059,6 @@
stop_fontconfig_monitor (manager);
- if (manager->priv->shell_name_watch_id > 0)
- g_bus_unwatch_name (manager->priv->shell_name_watch_id);
-
if (p->settings != NULL) {
g_hash_table_destroy (p->settings);
p->settings = NULL;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
