Hello community,
here is the log from the commit of package mate-settings-daemon for
openSUSE:Factory checked in at 2018-04-13 12:50:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.mate-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-settings-daemon"
Fri Apr 13 12:50:17 2018 rev:22 rq:595748 version:1.20.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-settings-daemon/mate-settings-daemon.changes
2018-03-20 21:58:08.990456709 +0100
+++
/work/SRC/openSUSE:Factory/.mate-settings-daemon.new/mate-settings-daemon.changes
2018-04-13 12:50:37.201705030 +0200
@@ -1,0 +2,7 @@
+Wed Apr 11 10:12:43 UTC 2018 - [email protected]
+
+- Update to version 1.20.1:
+ * Prevent media-keys bindings from swallowing modifier keys.
+ * Scale OSD size correctly on HiDPI displays.
+
+-------------------------------------------------------------------
Old:
----
mate-settings-daemon-1.20.0.tar.xz
New:
----
mate-settings-daemon-1.20.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.bzuI9t/_old 2018-04-13 12:50:38.625653441 +0200
+++ /var/tmp/diff_new_pack.bzuI9t/_new 2018-04-13 12:50:38.625653441 +0200
@@ -18,7 +18,7 @@
%define _version 1.20
Name: mate-settings-daemon
-Version: 1.20.0
+Version: 1.20.1
Release: 0
Summary: MATE session settings daemon
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ mate-settings-daemon-1.20.0.tar.xz -> mate-settings-daemon-1.20.1.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.20.0/ChangeLog
new/mate-settings-daemon-1.20.1/ChangeLog
--- old/mate-settings-daemon-1.20.0/ChangeLog 2018-02-06 17:35:12.000000000
+0100
+++ new/mate-settings-daemon-1.20.1/ChangeLog 2018-03-25 11:09:23.000000000
+0200
@@ -1,3 +1,71 @@
+commit e7bf4dce2a43319f13c9dfde2bffd74062b9831c
+Author: raveit65 <[email protected]>
+Date: Sun Mar 25 11:08:09 2018 +0200
+
+ release 1.20.1
+
+ NEWS | 15 ++++++++++-----
+ configure.ac | 2 +-
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+commit 9a6cfe3c44672f0a4b16bb6ae3dd311f1f4529fa
+Author: raveit65 <[email protected]>
+Date: Fri Mar 23 13:59:16 2018 +0100
+
+ tx: update config with branch specific resoures
+
+ .tx/config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit f5b5763d9a0c6e64e8fe28e50ecc84a17f83201a
+Author: raveit65 <[email protected]>
+Date: Sat Mar 17 15:37:31 2018 +0100
+
+ tx: add makepot and .pot files
+
+ makepot | 5 +
+ mate-settings-daemon.pot | 1229 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1234 insertions(+)
+
+commit a996cd9020ef41a4a4d8a51cb328a96c4349b711
+Author: raveit65 <[email protected]>
+Date: Mon Mar 12 09:14:45 2018 +0100
+
+ transifex: set minimum_perc and type in config file
+
+ .tx/config | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit b5cb3e0c947013eef2339d382774d7143c43d4b0
+Author: Victor Kareh <[email protected]>
+Date: Wed Mar 7 06:41:17 2018 -0500
+
+ Prevent media-keys bindings from swallowing modifier keys
+
+ This changes how the media-keys manager determines successful
+ key-bindings from KeyRelease to KeyPress so that it does not conflict
+ with third-party applications that want to use modifier keys as global
+ key-bindings. We've already done this change for general keybindings and
+ marco.
+
+ It also cleans up a bunch of deprectation warnings.
+
+ plugins/keybindings/msd-keybindings-manager.c | 20 ++++++-----
+ plugins/media-keys/msd-media-keys-manager.c | 52 +++++++++++++++++++--------
+ 2 files changed, 49 insertions(+), 23 deletions(-)
+
+commit 982a89bc39268101ca56cfecd3238ead6c9244b0
+Author: Victor Kareh <[email protected]>
+Date: Mon Feb 12 13:13:28 2018 -0500
+
+ Scale OSD size correctly on HiDPI displays (#212)
+
+ Also fix build warnings on xsettings
+
+ plugins/common/msd-osd-window.c | 15 ++++++++++-----
+ plugins/xsettings/msd-xsettings-manager.c | 4 ++--
+ 2 files changed, 12 insertions(+), 7 deletions(-)
+
commit a7700a97fba68eadf3e0675944cf1ec980eac52a
Author: raveit65 <[email protected]>
Date: Tue Feb 6 17:32:35 2018 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.20.0/NEWS
new/mate-settings-daemon-1.20.1/NEWS
--- old/mate-settings-daemon-1.20.0/NEWS 2018-02-06 17:32:07.000000000
+0100
+++ new/mate-settings-daemon-1.20.1/NEWS 2018-03-25 11:07:51.000000000
+0200
@@ -1,10 +1,15 @@
+### mate-settings-daemon 1.20.1
+
+ * Prevent media-keys bindings from swallowing modifier keys
+ * Scale OSD size correctly on HiDPI displays
+
### mate-settings-daemon 1.20.0
- bump required version of mate-desktop
- HiDPI: Load xsettings during initialization phase
- Add HiDPI configuration in XSettings
- require GTK+ 3.22 and GLib 2.50
- Add support for HiDPI displays
+ * bump required version of mate-desktop
+ * HiDPI: Load xsettings during initialization phase
+ * Add HiDPI configuration in XSettings
+ * require GTK+ 3.22 and GLib 2.50
+ * Add support for HiDPI displays
### mate-settings-daemon 1.19.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.20.0/configure
new/mate-settings-daemon-1.20.1/configure
--- old/mate-settings-daemon-1.20.0/configure 2018-02-06 17:34:24.000000000
+0100
+++ new/mate-settings-daemon-1.20.1/configure 2018-03-25 11:08:41.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-settings-daemon 1.20.0.
+# Generated by GNU Autoconf 2.69 for mate-settings-daemon 1.20.1.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-settings-daemon'
PACKAGE_TARNAME='mate-settings-daemon'
-PACKAGE_VERSION='1.20.0'
-PACKAGE_STRING='mate-settings-daemon 1.20.0'
+PACKAGE_VERSION='1.20.1'
+PACKAGE_STRING='mate-settings-daemon 1.20.1'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1484,7 +1484,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 mate-settings-daemon 1.20.0 to adapt to many kinds of
systems.
+\`configure' configures mate-settings-daemon 1.20.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1559,7 +1559,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-settings-daemon 1.20.0:";;
+ short | recursive ) echo "Configuration of mate-settings-daemon 1.20.1:";;
esac
cat <<\_ACEOF
@@ -1752,7 +1752,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-settings-daemon configure 1.20.0
+mate-settings-daemon configure 1.20.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2242,7 +2242,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-settings-daemon $as_me 1.20.0, which was
+It was created by mate-settings-daemon $as_me 1.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3109,7 +3109,7 @@
# Define the identity of the package.
PACKAGE='mate-settings-daemon'
- VERSION='1.20.0'
+ VERSION='1.20.1'
cat >>confdefs.h <<_ACEOF
@@ -21140,7 +21140,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-settings-daemon $as_me 1.20.0, which was
+This file was extended by mate-settings-daemon $as_me 1.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21206,7 +21206,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-settings-daemon config.status 1.20.0
+mate-settings-daemon config.status 1.20.1
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/mate-settings-daemon-1.20.0/configure.ac
new/mate-settings-daemon-1.20.1/configure.ac
--- old/mate-settings-daemon-1.20.0/configure.ac 2018-02-06
17:25:38.000000000 +0100
+++ new/mate-settings-daemon-1.20.1/configure.ac 2018-03-25
11:06:10.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([msd_api_version_major],[1])
m4_define([msd_api_version_minor],[20])
-m4_define([msd_api_version_micro],[0])
+m4_define([msd_api_version_micro],[1])
m4_define([msd_api_version],
[msd_api_version_major.msd_api_version_minor.msd_api_version_micro])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.20.0/plugins/common/msd-osd-window.c
new/mate-settings-daemon-1.20.1/plugins/common/msd-osd-window.c
--- old/mate-settings-daemon-1.20.0/plugins/common/msd-osd-window.c
2018-01-30 14:03:46.000000000 +0100
+++ new/mate-settings-daemon-1.20.1/plugins/common/msd-osd-window.c
2018-03-23 13:58:41.000000000 +0100
@@ -53,6 +53,7 @@
guint hide_timeout_id;
guint fade_timeout_id;
double fade_out_alpha;
+ gint scale_factor;
};
enum {
@@ -422,13 +423,16 @@
* @window: a #MsdOsdWindow
*
* Return value: TRUE if the @window's idea of being composited matches whether
- * its current screen is actually composited.
+ * its current screen is actually composited, and whether the scale factor has
+ * not changed since last draw.
*/
gboolean
msd_osd_window_is_valid (MsdOsdWindow *window)
{
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
- return gdk_screen_is_composited (screen) ==
window->priv->is_composited;
+ gint scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (window));
+ return gdk_screen_is_composited (screen) == window->priv->is_composited
+ && scale_factor == window->priv->scale_factor;
}
static void
@@ -441,6 +445,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (window));
window->priv->is_composited = gdk_screen_is_composited (screen);
+ window->priv->scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET
(window));
if (window->priv->is_composited) {
gdouble scalew, scaleh, scale;
@@ -453,8 +458,8 @@
gtk_style_context_add_class (style, "window-frame");
/* assume 130x130 on a 640x480 display and scale from there */
- scalew = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) /
640.0;
- scaleh = HeightOfScreen (gdk_x11_screen_get_xscreen (screen))
/ 480.0;
+ scalew = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) /
(640.0 * window->priv->scale_factor);
+ scaleh = HeightOfScreen (gdk_x11_screen_get_xscreen (screen))
/ (480.0 * window->priv->scale_factor);
scale = MIN (scalew, scaleh);
size = 130 * MAX (1, scale);
@@ -462,7 +467,7 @@
window->priv->fade_out_alpha = 1.0;
} else {
- gtk_container_set_border_width (GTK_CONTAINER (window), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (window), 12);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.20.0/plugins/keybindings/msd-keybindings-manager.c
new/mate-settings-daemon-1.20.1/plugins/keybindings/msd-keybindings-manager.c
---
old/mate-settings-daemon-1.20.0/plugins/keybindings/msd-keybindings-manager.c
2018-01-24 08:37:16.000000000 +0100
+++
new/mate-settings-daemon-1.20.1/plugins/keybindings/msd-keybindings-manager.c
2018-03-23 13:58:41.000000000 +0100
@@ -297,10 +297,12 @@
static void
binding_unregister_keys (MsdKeybindingsManager *manager)
{
+ GdkDisplay *dpy;
GSList *li;
gboolean need_flush = FALSE;
- gdk_error_trap_push ();
+ dpy = gdk_display_get_default ();
+ gdk_x11_display_error_trap_push (dpy);
for (li = manager->priv->binding_list; li != NULL; li = li->next) {
Binding *binding = (Binding *) li->data;
@@ -312,18 +314,20 @@
}
if (need_flush)
- gdk_flush ();
+ gdk_display_flush (dpy);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (dpy);
}
static void
binding_register_keys (MsdKeybindingsManager *manager)
{
GSList *li;
+ GdkDisplay *dpy;
gboolean need_flush = FALSE;
- gdk_error_trap_push ();
+ dpy = gdk_display_get_default ();
+ gdk_x11_display_error_trap_push (dpy);
/* Now check for changes and grab new key if not already used */
for (li = manager->priv->binding_list; li != NULL; li = li->next) {
@@ -353,8 +357,8 @@
}
if (need_flush)
- gdk_flush ();
- if (gdk_error_trap_pop ())
+ gdk_display_flush (dpy);
+ if (gdk_x11_display_error_trap_pop (dpy))
g_warning ("Grab failed for some keys, another application may
already have access the them.");
}
@@ -540,11 +544,11 @@
(GdkFilterFunc) keybindings_filter,
manager);
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (dpy);
/* Add KeyPressMask to the currently reportable event masks */
XGetWindowAttributes (xdpy, xwindow, &atts);
XSelectInput (xdpy, xwindow, atts.your_event_mask | KeyPressMask);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (dpy);
manager->priv->screens = get_screens_list ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.20.0/plugins/media-keys/msd-media-keys-manager.c
new/mate-settings-daemon-1.20.1/plugins/media-keys/msd-media-keys-manager.c
--- old/mate-settings-daemon-1.20.0/plugins/media-keys/msd-media-keys-manager.c
2018-01-30 14:03:46.000000000 +0100
+++ new/mate-settings-daemon-1.20.1/plugins/media-keys/msd-media-keys-manager.c
2018-03-23 13:58:41.000000000 +0100
@@ -264,11 +264,13 @@
MsdMediaKeysManager *manager)
{
int i;
+ GdkDisplay *dpy;
gboolean need_flush = TRUE;
g_return_if_fail (settings_key != NULL);
- gdk_error_trap_push ();
+ dpy = gdk_display_get_default ();
+ gdk_x11_display_error_trap_push (dpy);
/* Find the key that was modified */
for (i = 0; i < HANDLED_KEYS; i++) {
@@ -313,19 +315,21 @@
}
if (need_flush)
- gdk_flush ();
- if (gdk_error_trap_pop ())
+ gdk_display_flush (dpy);
+ if (gdk_x11_display_error_trap_pop (dpy))
g_warning ("Grab failed for some keys, another application may
already have access the them.");
}
static void init_kbd(MsdMediaKeysManager* manager)
{
int i;
+ GdkDisplay *dpy;
gboolean need_flush = FALSE;
mate_settings_profile_start(NULL);
- gdk_error_trap_push();
+ dpy = gdk_display_get_default ();
+ gdk_x11_display_error_trap_push (dpy);
for (i = 0; i < HANDLED_KEYS; i++)
{
@@ -373,10 +377,10 @@
if (need_flush)
{
- gdk_flush();
+ gdk_display_flush (dpy);
}
- if (gdk_error_trap_pop ())
+ if (gdk_x11_display_error_trap_pop (dpy))
{
g_warning("Grab failed for some keys, another application may
already have access the them.");
}
@@ -1057,7 +1061,7 @@
int i;
/* verify we have a key event */
- if (xev->type != KeyPress && xev->type != KeyRelease) {
+ if (xev->type != KeyPress) {
return GDK_FILTER_CONTINUE;
}
@@ -1071,10 +1075,6 @@
return GDK_FILTER_CONTINUE;
}
break;
- default:
- if (xev->type != KeyRelease) {
- return GDK_FILTER_CONTINUE;
- }
}
manager->priv->current_screen =
acme_get_screen_from_event (manager, xany);
@@ -1094,9 +1094,15 @@
start_media_keys_idle_cb (MsdMediaKeysManager *manager)
{
GSList *l;
+ GdkDisplay *dpy;
+ Display *xdpy;
g_debug ("Starting media_keys manager");
mate_settings_profile_start (NULL);
+
+ dpy = gdk_display_get_default ();
+ xdpy = GDK_DISPLAY_XDISPLAY (dpy);
+
manager->priv->volume_monitor = g_volume_monitor_get ();
manager->priv->settings = g_settings_new (BINDING_SCHEMA);
@@ -1105,14 +1111,28 @@
/* Start filtering the events */
for (l = manager->priv->screens; l != NULL; l = l->next) {
+ GdkWindow *window;
+ Window xwindow;
+ XWindowAttributes atts;
+
mate_settings_profile_start ("gdk_window_add_filter");
+ window = gdk_screen_get_root_window (l->data);
+ xwindow = GDK_WINDOW_XID (window);
+
g_debug ("adding key filter for screen: %d",
gdk_x11_screen_get_screen_number (l->data));
- gdk_window_add_filter (gdk_screen_get_root_window (l->data),
+ gdk_window_add_filter (window,
(GdkFilterFunc)acme_filter_events,
manager);
+
+ gdk_x11_display_error_trap_push (dpy);
+ /* Add KeyPressMask to the currently reportable event masks */
+ XGetWindowAttributes (xdpy, xwindow, &atts);
+ XSelectInput (xdpy, xwindow, atts.your_event_mask |
KeyPressMask);
+ gdk_x11_display_error_trap_pop_ignored (dpy);
+
mate_settings_profile_end ("gdk_window_add_filter");
}
@@ -1161,6 +1181,7 @@
msd_media_keys_manager_stop (MsdMediaKeysManager *manager)
{
MsdMediaKeysManagerPrivate *priv = manager->priv;
+ GdkDisplay *dpy;
GSList *ls;
GList *l;
int i;
@@ -1190,7 +1211,8 @@
}
need_flush = FALSE;
- gdk_error_trap_push ();
+ dpy = gdk_display_get_default ();
+ gdk_x11_display_error_trap_push (dpy);
for (i = 0; i < HANDLED_KEYS; ++i) {
if (keys[i].key) {
@@ -1204,9 +1226,9 @@
}
if (need_flush)
- gdk_flush ();
+ gdk_display_flush (dpy);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (dpy);
g_slist_free (priv->screens);
priv->screens = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.20.0/plugins/xsettings/msd-xsettings-manager.c
new/mate-settings-daemon-1.20.1/plugins/xsettings/msd-xsettings-manager.c
--- old/mate-settings-daemon-1.20.0/plugins/xsettings/msd-xsettings-manager.c
2018-02-06 17:20:55.000000000 +0100
+++ new/mate-settings-daemon-1.20.1/plugins/xsettings/msd-xsettings-manager.c
2018-03-23 13:58:41.000000000 +0100
@@ -542,7 +542,7 @@
wm_common_update_window();
gchar *wm = wm_common_get_current_window_manager ();
if (g_strcmp0 (wm, WM_COMMON_MARCO) == 0) {
- const gchar * const marco[] = {"marco", "--replace",
NULL};
+ gchar *marco[3] = {"marco", "--replace", NULL};
if (!g_spawn_async (NULL, marco, NULL,
G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
g_warning ("There was a problem restarting
marco: %s", error->message);
g_clear_error (&error);
@@ -554,7 +554,7 @@
/* FIXME: The ideal scenario would be for mate-panel to
respect window scaling and thus
* resize itself. Currently this is not happening, so msd
restarts it when the window
* scaling factor changes so that it's visually correct. */
- const gchar * const mate_panel[] = {"killall", "mate-panel",
NULL};
+ gchar *mate_panel[3] = {"killall", "mate-panel", NULL};
if (!g_spawn_async (NULL, mate_panel, NULL,
G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
g_warning ("There was a problem restarting mate-panel:
%s", error->message);
g_clear_error (&error);
