Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2017-07-28 09:45:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Fri Jul 28 09:45:04 2017 rev:136 rq:512699 version:3.24.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2017-07-17 08:59:38.009317859 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2017-07-28 09:45:16.880220577 +0200
@@ -1,0 +2,14 @@
+Sat Jul 22 17:03:30 UTC 2017 - [email protected]
+
+- Update to version 3.24.3:
+ + Color: Fix smearing out of Night Light effect.
+ + Keyboard: Only add the "us" layout if the system config cannot
+ be determined.
+ + Media-keys: Fix grabbing of previously disabled shortcuts.
+ + Wacom:
+ - Fix touchscreens being assigned the wrong output.
+ - Exclude non-display attached devices from remapping.
+- Disable gnome-settings-daemon-initial-keyboard.patch: Needs
+ rebase.
+
+-------------------------------------------------------------------
Old:
----
gnome-settings-daemon-3.24.2.tar.xz
New:
----
gnome-settings-daemon-3.24.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.MBa70l/_old 2017-07-28 09:45:19.335874698 +0200
+++ /var/tmp/diff_new_pack.MBa70l/_new 2017-07-28 09:45:19.339874135 +0200
@@ -30,7 +30,7 @@
%endif
Name: gnome-settings-daemon
-Version: 3.24.2
+Version: 3.24.3
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
@@ -45,7 +45,7 @@
Patch2: 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
Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch
-# 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
+# PATCH-NEEDS-REBASE gnome-settings-daemon-initial-keyboard.patch bsc#979051
boo#1009515 [email protected] -- Deal with the default keyboard being set from
xkb instead of GNOME -- WAS PATCH-FIX-OPENSUSE
Patch4: 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
Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch
@@ -159,7 +159,8 @@
%patch2 -p1
%patch3 -p0
%endif
-%patch4 -p1
+# Patch needs rebase (boo#1050812)
+#patch4 -p1
%if 0%{?suse_version} == 1315
%patch5 -p1
%patch6 -p1
++++++ gnome-settings-daemon-3.24.2.tar.xz ->
gnome-settings-daemon-3.24.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/Makefile.am
new/gnome-settings-daemon-3.24.3/Makefile.am
--- old/gnome-settings-daemon-3.24.2/Makefile.am 2017-05-09
17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/Makefile.am 2017-06-12
16:42:48.000000000 +0200
@@ -2,8 +2,8 @@
SUBDIRS = \
gnome-settings-daemon \
- plugins \
data \
+ plugins \
po \
tests \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/Makefile.in
new/gnome-settings-daemon-3.24.3/Makefile.in
--- old/gnome-settings-daemon-3.24.2/Makefile.in 2017-05-09
18:30:39.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/Makefile.in 2017-07-22
18:31:17.000000000 +0200
@@ -447,8 +447,8 @@
NULL =
SUBDIRS = \
gnome-settings-daemon \
- plugins \
data \
+ plugins \
po \
tests \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/NEWS
new/gnome-settings-daemon-3.24.3/NEWS
--- old/gnome-settings-daemon-3.24.2/NEWS 2017-05-09 18:30:03.000000000
+0200
+++ new/gnome-settings-daemon-3.24.3/NEWS 2017-07-22 18:29:49.000000000
+0200
@@ -1,4 +1,21 @@
==============
+Version 3.24.3
+==============
+
+Color:
+- Fix smearing out of Night Light effect
+
+Keyboard:
+- Only add the "us" layout if the system config cannot be determined
+
+Media-keys:
+- Fix grabbing of previously disabled shortcuts
+
+Wacom:
+- Fix touchscreens being assigned the wrong output
+- Exclude non-display attached devices from remapping
+
+==============
Version 3.24.2
==============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/configure
new/gnome-settings-daemon-3.24.3/configure
--- old/gnome-settings-daemon-3.24.2/configure 2017-05-09 18:30:38.000000000
+0200
+++ new/gnome-settings-daemon-3.24.3/configure 2017-07-22 18:31:16.000000000
+0200
@@ -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.24.2.
+# Generated by GNU Autoconf 2.69 for gnome-settings-daemon 3.24.3.
#
# 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.24.2'
-PACKAGE_STRING='gnome-settings-daemon 3.24.2'
+PACKAGE_VERSION='3.24.3'
+PACKAGE_STRING='gnome-settings-daemon 3.24.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon'
PACKAGE_URL=''
@@ -1560,7 +1560,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.24.2 to adapt to many kinds of
systems.
+\`configure' configures gnome-settings-daemon 3.24.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1631,7 +1631,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-settings-daemon
3.24.2:";;
+ short | recursive ) echo "Configuration of gnome-settings-daemon
3.24.3:";;
esac
cat <<\_ACEOF
@@ -1885,7 +1885,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-settings-daemon configure 3.24.2
+gnome-settings-daemon configure 3.24.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2375,7 +2375,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.24.2, which was
+It was created by gnome-settings-daemon $as_me 3.24.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3242,7 +3242,7 @@
# Define the identity of the package.
PACKAGE='gnome-settings-daemon'
- VERSION='3.24.2'
+ VERSION='3.24.3'
cat >>confdefs.h <<_ACEOF
@@ -22866,7 +22866,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.24.2, which was
+This file was extended by gnome-settings-daemon $as_me 3.24.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22932,7 +22932,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.24.2
+gnome-settings-daemon config.status 3.24.3
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.24.2/configure.ac
new/gnome-settings-daemon-3.24.3/configure.ac
--- old/gnome-settings-daemon-3.24.2/configure.ac 2017-05-09
18:30:03.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/configure.ac 2017-07-22
18:29:49.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ([2.69])
AC_INIT([gnome-settings-daemon],
- [3.24.2],
+ [3.24.3],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-bus.c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/data/gnome-settings-daemon.convert
new/gnome-settings-daemon-3.24.3/data/gnome-settings-daemon.convert
--- old/gnome-settings-daemon-3.24.2/data/gnome-settings-daemon.convert
2017-05-09 17:57:50.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/data/gnome-settings-daemon.convert
2017-07-22 18:29:49.000000000 +0200
@@ -1,15 +1,6 @@
[org.gnome.settings-daemon.peripherals.smartcard]
removal-action = /desktop/gnome/peripherals/smartcard/removal_action
-[org.gnome.settings-daemon.peripherals.touchpad]
-disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing
-horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled
-scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method
-tap-to-click = /desktop/gnome/peripherals/touchpad/tap_to_click
-touchpad-enabled = /desktop/gnome/peripherals/touchpad/touchpad_enabled
-motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
-motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
-
[org.gnome.settings-daemon.plugins.housekeeping]
free-percent-notify =
/apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify
free-percent-notify-again =
/apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again
@@ -42,9 +33,6 @@
locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
double-click = /desktop/gnome/peripherals/mouse/double_click
drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
-left-handed = /desktop/gnome/peripherals/mouse/left_handed
-motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
-motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
[org.gnome.settings-daemon.plugins.xrandr]
default-configuration-file =
/apps/gnome_settings_daemon/xrandr/default_configuration_file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-screen-saver-glue.c
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-screen-saver-glue.c
---
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-screen-saver-glue.c
2017-05-09 18:39:38.000000000 +0200
+++
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-screen-saver-glue.c
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-screen-saver-glue.h
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-screen-saver-glue.h
---
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-screen-saver-glue.h
2017-05-09 18:39:38.000000000 +0200
+++
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-screen-saver-glue.h
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-session-manager-glue.c
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-session-manager-glue.c
---
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-session-manager-glue.c
2017-05-09 18:39:38.000000000 +0200
+++
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-session-manager-glue.c
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-session-manager-glue.h
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-session-manager-glue.h
---
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-session-manager-glue.h
2017-05-09 18:39:38.000000000 +0200
+++
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-session-manager-glue.h
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-shell-glue.c
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-shell-glue.c
--- old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-shell-glue.c
2017-05-09 18:39:38.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-shell-glue.c
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-shell-glue.h
new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-shell-glue.h
--- old/gnome-settings-daemon-3.24.2/gnome-settings-daemon/gsd-shell-glue.h
2017-05-09 18:39:38.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/gnome-settings-daemon/gsd-shell-glue.h
2017-07-22 18:31:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/color/Makefile.am
new/gnome-settings-daemon-3.24.3/plugins/color/Makefile.am
--- old/gnome-settings-daemon-3.24.2/plugins/color/Makefile.am 2017-05-09
17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/color/Makefile.am 2017-06-12
16:42:48.000000000 +0200
@@ -30,6 +30,15 @@
TESTS = gcm-self-test
+BUILT_SOURCES = gschemas.compiled
+
+CLEANFILES = gschemas.compiled
+
+gschemas.compiled:
$(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml
+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$<
--targetdir=$(builddir)
+
+all-am: gschemas.compiled
+
libexec_PROGRAMS = gsd-color
gsd_color_SOURCES = \
main.c \
@@ -80,7 +89,7 @@
test-data/Lenovo-T61-Internal.bin \
test-data/LG-L225W-External.bin
-CLEANFILES = \
+CLEANFILES += \
$(desktop_DATA)
DISTCLEANFILES = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/color/Makefile.in
new/gnome-settings-daemon-3.24.3/plugins/color/Makefile.in
--- old/gnome-settings-daemon-3.24.2/plugins/color/Makefile.in 2017-05-09
18:30:39.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/color/Makefile.in 2017-07-22
18:31:17.000000000 +0200
@@ -672,6 +672,8 @@
$(SETTINGS_PLUGIN_LIBS) \
$(LIBM)
+BUILT_SOURCES = gschemas.compiled
+CLEANFILES = gschemas.compiled $(desktop_DATA)
gsd_color_SOURCES = \
main.c \
gnome-datetime-source.c \
@@ -717,13 +719,11 @@
test-data/Lenovo-T61-Internal.bin \
test-data/LG-L225W-External.bin
-CLEANFILES = \
- $(desktop_DATA)
-
DISTCLEANFILES = \
$(desktop_DATA)
-all: all-am
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
@@ -1336,13 +1336,15 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(desktopdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -1377,6 +1379,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \
@@ -1448,7 +1451,7 @@
uninstall-am: uninstall-desktopDATA uninstall-libexecPROGRAMS
-.MAKE: check-am install-am install-strip
+.MAKE: all check check-am install install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \
@@ -1469,6 +1472,11 @@
.PRECIOUS: Makefile
+gschemas.compiled:
$(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml
+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$<
--targetdir=$(builddir)
+
+all-am: gschemas.compiled
+
org.gnome.SettingsDaemon.Color.desktop: $(desktop_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/color/gcm-self-test.c
new/gnome-settings-daemon-3.24.3/plugins/color/gcm-self-test.c
--- old/gnome-settings-daemon-3.24.2/plugins/color/gcm-self-test.c
2017-05-09 17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/color/gcm-self-test.c
2017-06-12 16:42:48.000000000 +0200
@@ -281,11 +281,17 @@
int
main (int argc, char **argv)
{
+ char *schema_dir;
+
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
gtk_init (&argc, &argv);
g_test_init (&argc, &argv, NULL);
+ schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL);
+ g_setenv("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE);
+ g_free (schema_dir);
+
g_test_add_func ("/color/edid", gcm_test_edid_func);
g_test_add_func ("/color/sunset-sunrise", gcm_test_sunset_sunrise);
g_test_add_func ("/color/sunset-sunrise/fractional-timezone",
gcm_test_sunset_sunrise_fractional_timezone);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/color/gsd-night-light.c
new/gnome-settings-daemon-3.24.3/plugins/color/gsd-night-light.c
--- old/gnome-settings-daemon-3.24.2/plugins/color/gsd-night-light.c
2017-05-09 17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/color/gsd-night-light.c
2017-07-22 18:17:08.000000000 +0200
@@ -320,7 +320,7 @@
} else if (gsd_night_light_frac_day_is_between (frac_day,
schedule_to - smear,
schedule_to)) {
- gdouble factor = ((schedule_to - smear) - frac_day) / smear;
+ gdouble factor = (frac_day - (schedule_to - smear)) / smear;
temp_smeared = linear_interpolate
(GSD_COLOR_TEMPERATURE_DEFAULT,
temperature, factor);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-common-enums.c
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-common-enums.c
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-common-enums.c
2017-05-09 18:39:39.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-common-enums.c
2017-07-22 18:31:51.000000000 +0200
@@ -16,6 +16,7 @@
{ GSD_DEVICE_TYPE_TOUCHPAD, "GSD_DEVICE_TYPE_TOUCHPAD", "touchpad" },
{ GSD_DEVICE_TYPE_TABLET, "GSD_DEVICE_TYPE_TABLET", "tablet" },
{ GSD_DEVICE_TYPE_TOUCHSCREEN, "GSD_DEVICE_TYPE_TOUCHSCREEN",
"touchscreen" },
+ { GSD_DEVICE_TYPE_PAD, "GSD_DEVICE_TYPE_PAD", "pad" },
{ 0, NULL, NULL }
};
etype = g_flags_register_static ("GsdDeviceType", values);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-udev.c
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-udev.c
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-udev.c
2015-05-22 17:06:01.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-udev.c
2017-07-22 18:29:49.000000000 +0200
@@ -24,6 +24,7 @@
#include <string.h>
#include <gudev/gudev.h>
+#include <gdk/gdkwayland.h>
#include "gsd-device-manager-udev.h"
struct _GsdUdevDeviceManager
@@ -46,7 +47,8 @@
"ID_INPUT_KEYBOARD",
"ID_INPUT_TOUCHPAD",
"ID_INPUT_TABLET",
- "ID_INPUT_TOUCHSCREEN"
+ "ID_INPUT_TOUCHSCREEN",
+ "ID_INPUT_TABLET_PAD",
};
static GsdDeviceType
@@ -90,8 +92,14 @@
name = g_udev_device_get_sysfs_attr (parent, "name");
vendor = g_udev_device_get_property (udev_device, "ID_VENDOR_ID");
product = g_udev_device_get_property (udev_device, "ID_MODEL_ID");
+
+ if (!vendor || !product) {
+ vendor = g_udev_device_get_sysfs_attr (udev_device,
"device/id/vendor");
+ product = g_udev_device_get_sysfs_attr (udev_device,
"device/id/product");
+ }
+
width = g_udev_device_get_property_as_int (udev_device,
"ID_INPUT_WIDTH_MM");
- height = g_udev_device_get_property_as_int (udev_device,
"ID_INPUT_WIDTH_MM");
+ height = g_udev_device_get_property_as_int (udev_device,
"ID_INPUT_HEIGHT_MM");
device = g_object_new (GSD_TYPE_DEVICE,
"name", name,
@@ -221,6 +229,30 @@
return devices;
}
+static GsdDevice *
+gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
+ GdkDevice *gdk_device)
+{
+ const gchar *node_path;
+ GHashTableIter iter;
+ GsdDevice *device;
+
+ node_path = gdk_wayland_device_get_node_path (gdk_device);
+ if (!node_path)
+ return NULL;
+
+ g_hash_table_iter_init (&iter, GSD_UDEV_DEVICE_MANAGER
(manager)->devices);
+
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
+ if (g_strcmp0 (node_path,
+ gsd_device_get_device_file (device)) == 0) {
+ return device;
+ }
+ }
+
+ return NULL;
+}
+
static void
gsd_udev_device_manager_class_init (GsdUdevDeviceManagerClass *klass)
{
@@ -229,4 +261,5 @@
object_class->finalize = gsd_udev_device_manager_finalize;
manager_class->list_devices = gsd_udev_device_manager_list_devices;
+ manager_class->lookup_device = gsd_udev_device_manager_lookup_device;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-x11.c
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-x11.c
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-x11.c
2017-05-09 17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-x11.c
2017-07-22 18:29:49.000000000 +0200
@@ -21,6 +21,7 @@
#include "config.h"
+#include <string.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -40,6 +41,9 @@
GsdDeviceManagerClass parent_class;
};
+GsdDevice * gsd_x11_device_manager_lookup_gdk_device (GsdDeviceManager
*manager,
+ GdkDevice
*gdk_device);
+
G_DEFINE_TYPE (GsdX11DeviceManager, gsd_x11_device_manager,
GSD_TYPE_DEVICE_MANAGER)
static GsdDeviceType
@@ -51,10 +55,13 @@
switch (source) {
case GDK_SOURCE_MOUSE:
+ case GDK_SOURCE_TRACKPOINT:
return GSD_DEVICE_TYPE_MOUSE;
case GDK_SOURCE_PEN:
case GDK_SOURCE_ERASER:
case GDK_SOURCE_CURSOR:
+ if (strstr (gdk_device_get_name (gdk_device), "pad"))
+ return GSD_DEVICE_TYPE_TABLET | GSD_DEVICE_TYPE_PAD;
return GSD_DEVICE_TYPE_TABLET;
case GDK_SOURCE_KEYBOARD:
return GSD_DEVICE_TYPE_KEYBOARD;
@@ -62,10 +69,11 @@
return GSD_DEVICE_TYPE_TOUCHSCREEN;
case GDK_SOURCE_TOUCHPAD:
return GSD_DEVICE_TYPE_TOUCHPAD;
- default:
- g_warning ("Unhandled input source %d\n", source);
+ case GDK_SOURCE_TABLET_PAD:
+ return GSD_DEVICE_TYPE_TABLET | GSD_DEVICE_TYPE_PAD;
}
+ g_warning ("Unhandled input source %d\n", source);
return 0;
}
@@ -213,51 +221,20 @@
GsdDeviceManagerClass *manager_class = GSD_DEVICE_MANAGER_CLASS (klass);
manager_class->list_devices = gsd_x11_device_manager_list_devices;
-}
-
-GdkDevice **
-gsd_x11_device_manager_get_gdk_devices (GsdX11DeviceManager *manager,
- GsdDevice *device,
- guint *n_gdk_devices)
-{
- const gchar *device_node;
- GPtrArray *gdk_devices;
- GdkDevice *gdk_device;
- GHashTableIter iter;
-
- if (n_gdk_devices)
- *n_gdk_devices = 0;
-
- g_return_val_if_fail (GSD_IS_X11_DEVICE_MANAGER (manager), NULL);
- g_return_val_if_fail (GSD_IS_DEVICE (device), NULL);
-
- gdk_devices = g_ptr_array_new ();
- g_hash_table_iter_init (&iter, manager->gdk_devices);
-
- while (g_hash_table_iter_next (&iter, (gpointer *) &gdk_device,
(gpointer *) &device_node)) {
- if (g_strcmp0 (gsd_device_get_device_file (device),
device_node) == 0)
- g_ptr_array_add (gdk_devices, gdk_device);
- }
-
- if (n_gdk_devices)
- *n_gdk_devices = gdk_devices->len;
-
- return (GdkDevice **) g_ptr_array_free (gdk_devices, FALSE);
+ manager_class->lookup_device = gsd_x11_device_manager_lookup_gdk_device;
}
GsdDevice *
-gsd_x11_device_manager_lookup_gdk_device (GsdX11DeviceManager *manager,
- GdkDevice *gdk_device)
+gsd_x11_device_manager_lookup_gdk_device (GsdDeviceManager *manager,
+ GdkDevice *gdk_device)
{
+ GsdX11DeviceManager *manager_x11 = GSD_X11_DEVICE_MANAGER (manager);
const gchar *device_node;
- g_return_val_if_fail (GSD_IS_X11_DEVICE_MANAGER (manager), NULL);
- g_return_val_if_fail (GDK_IS_DEVICE (gdk_device), NULL);
-
- device_node = g_hash_table_lookup (manager->gdk_devices, gdk_device);
+ device_node = g_hash_table_lookup (manager_x11->gdk_devices,
gdk_device);
if (!device_node)
return NULL;
- return g_hash_table_lookup (manager->devices, device_node);
+ return g_hash_table_lookup (manager_x11->devices, device_node);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-x11.h
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-x11.h
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager-x11.h
2015-05-22 17:06:01.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-x11.h
2017-07-22 18:29:49.000000000 +0200
@@ -39,12 +39,6 @@
GType gsd_x11_device_manager_get_type (void) G_GNUC_CONST;
-GdkDevice ** gsd_x11_device_manager_get_gdk_devices (GsdX11DeviceManager
*manager,
- GsdDevice
*device,
- guint
*n_gdk_devices);
-GsdDevice * gsd_x11_device_manager_lookup_gdk_device (GsdX11DeviceManager
*manager,
- GdkDevice
*gdk_device);
-
G_END_DECLS
#endif /* __GSD_X11_DEVICE_MANAGER_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager.c
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager.c
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager.c
2016-03-15 15:54:50.000000000 +0100
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager.c
2017-07-22 18:29:49.000000000 +0200
@@ -415,3 +415,19 @@
return priv->width > 0 && priv->height > 0;
}
+
+GsdDevice *
+gsd_device_manager_lookup_gdk_device (GsdDeviceManager *manager,
+ GdkDevice *gdk_device)
+{
+ GsdDeviceManagerClass *klass;
+
+ g_return_val_if_fail (GSD_IS_DEVICE_MANAGER (manager), NULL);
+ g_return_val_if_fail (GDK_IS_DEVICE (gdk_device), NULL);
+
+ klass = GSD_DEVICE_MANAGER_GET_CLASS (manager);
+ if (!klass->lookup_device)
+ return NULL;
+
+ return klass->lookup_device (manager, gdk_device);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager.h
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager.h
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-manager.h
2016-03-15 15:54:50.000000000 +0100
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager.h
2017-07-22 18:29:49.000000000 +0200
@@ -20,6 +20,7 @@
#ifndef __GSD_DEVICE_MANAGER_H__
#define __GSD_DEVICE_MANAGER_H__
+#include <gdk/gdk.h>
#include <glib-object.h>
#include <gio/gio.h>
@@ -49,7 +50,8 @@
GSD_DEVICE_TYPE_KEYBOARD = 1 << 1,
GSD_DEVICE_TYPE_TOUCHPAD = 1 << 2,
GSD_DEVICE_TYPE_TABLET = 1 << 3,
- GSD_DEVICE_TYPE_TOUCHSCREEN = 1 << 4
+ GSD_DEVICE_TYPE_TOUCHSCREEN = 1 << 4,
+ GSD_DEVICE_TYPE_PAD = 1 << 5
} GsdDeviceType;
struct _GsdDevice {
@@ -78,6 +80,9 @@
GsdDevice *device);
void (* device_changed) (GsdDeviceManager *manager,
GsdDevice *device);
+
+ GsdDevice * (* lookup_device) (GsdDeviceManager *manager,
+ GdkDevice *gdk_device);
};
GType gsd_device_get_type (void) G_GNUC_CONST;
@@ -98,12 +103,8 @@
guint *width,
guint *height);
-#ifdef GDK_WINDOWING_X11
-GdkDevice ** gsd_device_get_gdk_devices (GsdDevice *device,
- guint *n_gdk_devices);
GsdDevice * gsd_device_manager_lookup_gdk_device (GsdDeviceManager
*manager,
GdkDevice
*gdk_device);
-#endif
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-mapper.c
new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-mapper.c
--- old/gnome-settings-daemon-3.24.2/plugins/common/gsd-device-mapper.c
2017-05-09 17:57:14.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/common/gsd-device-mapper.c
2017-07-22 18:29:49.000000000 +0200
@@ -559,6 +559,9 @@
if (input->capabilities & GSD_INPUT_IS_PAD)
return;
+ if ((input->capabilities &
+ (GSD_INPUT_IS_SCREEN_INTEGRATED | GSD_INPUT_IS_SYSTEM_INTEGRATED))
== 0)
+ return;
output = input_info_get_output (input);
settings_set_display (gsd_device_get_settings (input->device),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/datetime/timedated.c
new/gnome-settings-daemon-3.24.3/plugins/datetime/timedated.c
--- old/gnome-settings-daemon-3.24.2/plugins/datetime/timedated.c
2017-05-09 18:39:45.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/datetime/timedated.c
2017-07-22 18:31:55.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/datetime/timedated.h
new/gnome-settings-daemon-3.24.3/plugins/datetime/timedated.h
--- old/gnome-settings-daemon-3.24.2/plugins/datetime/timedated.h
2017-05-09 18:39:45.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/datetime/timedated.h
2017-07-22 18:31:55.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/plugins/datetime/tz.c
new/gnome-settings-daemon-3.24.3/plugins/datetime/tz.c
--- old/gnome-settings-daemon-3.24.2/plugins/datetime/tz.c 2014-06-03
17:07:24.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/datetime/tz.c 2017-06-12
16:58:21.000000000 +0200
@@ -29,6 +29,7 @@
#include <time.h>
#include <math.h>
#include <string.h>
+#include <ctype.h>
#include "tz.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/keyboard/gsd-keyboard-manager.c
new/gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c
--- old/gnome-settings-daemon-3.24.2/plugins/keyboard/gsd-keyboard-manager.c
2016-10-11 17:34:16.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c
2017-07-22 18:29:49.000000000 +0200
@@ -441,7 +441,6 @@
gint i, n;
gchar **layouts = NULL;
gchar **variants = NULL;
- gboolean have_default_layout = FALSE;
v = g_dbus_proxy_get_cached_property (priv->localed, "X11Layout");
if (v) {
@@ -451,8 +450,12 @@
g_variant_unref (v);
}
- if (!layouts)
- return;
+ init_builder_with_sources (&builder, priv->input_sources_settings);
+
+ if (!layouts) {
+ g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
+ goto out;
+ }
v = g_dbus_proxy_get_cached_property (priv->localed, "X11Variant");
if (v) {
@@ -467,8 +470,6 @@
else
n = g_strv_length (layouts);
- init_builder_with_sources (&builder, priv->input_sources_settings);
-
for (i = 0; i < n && layouts[i][0]; ++i) {
gchar *id;
@@ -477,16 +478,11 @@
else
id = g_strdup (layouts[i]);
- if (g_str_equal (id, DEFAULT_LAYOUT))
- have_default_layout = TRUE;
-
g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, id);
g_free (id);
}
- if (!have_default_layout)
- g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
-
+out:
g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES,
g_variant_builder_end (&builder));
g_strfreev (layouts);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-marshal.c
new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-marshal.c
--- old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-marshal.c
2017-05-09 18:39:51.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-marshal.c
2017-07-22 18:31:59.000000000 +0200
@@ -1,10 +1,4 @@
-
-#ifndef __gsd_marshal_MARSHAL_H__
-#define __gsd_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
+#include <glib-object.h>
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
@@ -52,14 +46,15 @@
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
-
/* VOID:STRING,STRING (gsd-marshal.list:1) */
-G_GNUC_INTERNAL void gsd_marshal_VOID__STRING_STRING (GClosure *closure,
- GValue
*return_value,
- guint
n_param_values,
- const GValue
*param_values,
- gpointer
invocation_hint,
- gpointer
marshal_data);
+/* Prototype for -Wmissing-prototypes */
+G_GNUC_INTERNAL
+void gsd_marshal_VOID__STRING_STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
void
gsd_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -68,13 +63,13 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- GMarshalFunc_VOID__STRING_STRING callback;
- GCClosure *cc = (GCClosure*) closure;
+ typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer data2);
+ GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
+ GMarshalFunc_VOID__STRING_STRING callback;
g_return_if_fail (n_param_values == 3);
@@ -96,7 +91,3 @@
data2);
}
-G_END_DECLS
-
-#endif /* __gsd_marshal_MARSHAL_H__ */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-marshal.h
new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-marshal.h
--- old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-marshal.h
2017-05-09 18:39:51.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-marshal.h
2017-07-22 18:31:59.000000000 +0200
@@ -1,20 +1,21 @@
+/* This file is generated, all changes will be lost */
+#ifndef __GSD_MARSHAL_MARSHAL_H__
+#define __GSD_MARSHAL_MARSHAL_H__
-#ifndef __gsd_marshal_MARSHAL_H__
-#define __gsd_marshal_MARSHAL_H__
-
-#include <glib-object.h>
+#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:STRING,STRING (gsd-marshal.list:1) */
-G_GNUC_INTERNAL void gsd_marshal_VOID__STRING_STRING (GClosure *closure,
- GValue
*return_value,
- guint
n_param_values,
- const GValue
*param_values,
- gpointer
invocation_hint,
- gpointer
marshal_data);
+G_GNUC_INTERNAL
+void gsd_marshal_VOID__STRING_STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
-G_END_DECLS
-#endif /* __gsd_marshal_MARSHAL_H__ */
+G_END_DECLS
+#endif /* __GSD_MARSHAL_MARSHAL_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-media-keys-manager.c
new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-media-keys-manager.c
---
old/gnome-settings-daemon-3.24.2/plugins/media-keys/gsd-media-keys-manager.c
2017-05-09 18:30:03.000000000 +0200
+++
new/gnome-settings-daemon-3.24.3/plugins/media-keys/gsd-media-keys-manager.c
2017-07-22 18:29:49.000000000 +0200
@@ -319,8 +319,21 @@
}
static char *
-get_key_string (GsdMediaKeysManager *manager,
- MediaKey *key)
+get_key_string (MediaKey *key)
+{
+ if (key->settings_key != NULL)
+ return g_strdup_printf ("settings:%s", key->settings_key);
+ else if (key->hard_coded != NULL)
+ return g_strdup_printf ("fixed:%s", key->hard_coded);
+ else if (key->custom_path != NULL)
+ return g_strdup_printf ("custom:%s", key->custom_path);
+ else
+ g_assert_not_reached ();
+}
+
+static char *
+get_binding (GsdMediaKeysManager *manager,
+ MediaKey *key)
{
if (key->settings_key != NULL)
return g_settings_get_string (manager->priv->settings,
key->settings_key);
@@ -462,7 +475,7 @@
char *tmp;
key = g_ptr_array_index (manager->priv->keys, i);
- tmp = get_key_string (manager, key);
+ tmp = get_binding (manager, key);
g_variant_builder_add (&builder, "(su)", tmp, key->modes);
g_free (tmp);
}
@@ -479,7 +492,7 @@
GAsyncResult *result,
gpointer user_data)
{
- char *binding;
+ char *keyname;
GrabData *data = user_data;
MediaKey *key = data->key;
GsdMediaKeysManager *manager = data->manager;
@@ -492,19 +505,20 @@
g_error_free (error);
}
+ keyname = get_key_string (key);
+ g_hash_table_remove (manager->priv->keys_pending_grab, keyname);
+
if (key->ungrab_requested)
ungrab_media_key (key, manager);
- binding = get_key_string (manager, key);
- g_hash_table_remove (manager->priv->keys_pending_grab, binding);
media_key_unref (key);
g_slice_free (GrabData, data);
- if ((key = g_hash_table_lookup (manager->priv->keys_to_grab, binding))
!= NULL) {
+ if ((key = g_hash_table_lookup (manager->priv->keys_to_grab, keyname))
!= NULL) {
grab_media_key (key, manager);
- g_hash_table_remove (manager->priv->keys_to_grab, binding);
+ g_hash_table_remove (manager->priv->keys_to_grab, keyname);
}
- g_free (binding);
+ g_free (keyname);
}
@@ -513,12 +527,13 @@
GsdMediaKeysManager *manager)
{
GrabData *data;
- char *binding;
+ char *binding, *keyname;
- binding = get_key_string (manager, key);
- if (g_hash_table_lookup (manager->priv->keys_pending_grab, binding)) {
+ keyname = get_key_string (key);
+ binding = get_binding (manager, key);
+ if (g_hash_table_lookup (manager->priv->keys_pending_grab, keyname)) {
g_hash_table_insert (manager->priv->keys_to_grab,
- g_strdup (binding), media_key_ref (key));
+ g_strdup (keyname), media_key_ref (key));
goto out;
}
@@ -531,8 +546,9 @@
manager->priv->grab_cancellable,
grab_accelerator_complete,
data);
- g_hash_table_add (manager->priv->keys_pending_grab, g_strdup
(binding));
+ g_hash_table_add (manager->priv->keys_pending_grab, g_strdup
(keyname));
out:
+ g_free (keyname);
g_free (binding);
}
@@ -551,12 +567,27 @@
}
}
+static gboolean
+is_pending_grab (MediaKey *key,
+ GsdMediaKeysManager *manager)
+{
+ char *keyname = get_key_string (key);
+ const char *val;
+ gboolean pending_grab;
+
+ val = g_hash_table_lookup (manager->priv->keys_pending_grab, keyname);
+ pending_grab = val != NULL;
+ g_free (keyname);
+
+ return pending_grab;
+}
+
static void
ungrab_media_key (MediaKey *key,
GsdMediaKeysManager *manager)
{
if (key->accel_id == 0) {
- key->ungrab_requested = TRUE;
+ key->ungrab_requested = is_pending_grab (key, manager);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/media-keys/shell-key-grabber.c
new/gnome-settings-daemon-3.24.3/plugins/media-keys/shell-key-grabber.c
--- old/gnome-settings-daemon-3.24.2/plugins/media-keys/shell-key-grabber.c
2017-05-09 18:39:51.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/media-keys/shell-key-grabber.c
2017-07-22 18:31:59.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.24.2/plugins/media-keys/shell-key-grabber.h
new/gnome-settings-daemon-3.24.3/plugins/media-keys/shell-key-grabber.h
--- old/gnome-settings-daemon-3.24.2/plugins/media-keys/shell-key-grabber.h
2017-05-09 18:39:51.000000000 +0200
+++ new/gnome-settings-daemon-3.24.3/plugins/media-keys/shell-key-grabber.h
2017-07-22 18:31:59.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.53.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.24.2/po/sr.po
new/gnome-settings-daemon-3.24.3/po/sr.po
--- old/gnome-settings-daemon-3.24.2/po/sr.po 2017-05-09 17:57:14.000000000
+0200
+++ new/gnome-settings-daemon-3.24.3/po/sr.po 2017-06-12 16:42:48.000000000
+0200
@@ -9,28 +9,26 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-control-center\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"settings-daemon&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-14 17:56+0000\n"
-"PO-Revision-Date: 2017-02-25 19:51+0200\n"
-"Last-Translator: Мирослав Николић <[email protected]>\n"
+"POT-Creation-Date: 2017-05-09 16:27+0000\n"
+"PO-Revision-Date: 2017-05-20 17:16+0200\n"
+"Last-Translator: Марко М. Костић <[email protected]>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.2\n"
#: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:1
msgid "Smartcard removal action"
msgstr "Радња уклањања паметне картице"
#: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:2
-#| msgid ""
-#| "Set this to one of \"none\", \"lock-screen\", or \"force-logout\". The "
-#| "action will get performed when the smartcard used for log in is removed."
msgid ""
"Set this to one of “none”, “lock-screen”, or “force-logout”. The action will "
"get performed when the smartcard used for log in is removed."
@@ -63,8 +61,6 @@
msgstr "Растојање пре почетка превлачења."
#: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:8
-#| msgid ""
-#| "Whether the tablet's orientation is locked, or rotated automatically."
msgid "Whether the tablet’s orientation is locked, or rotated automatically."
msgstr "Да ли је усмерење таблице закључано, или самостално окренуто."
@@ -101,15 +97,13 @@
msgstr "Ротација Ваком таблице"
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:8
-#| msgid ""
-#| "Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, "
-#| "and 'ccw' for 90 degree counterclockwise."
msgid ""
"Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and "
"“ccw” for 90 degree counterclockwise."
msgstr ""
-"Поставите ово на „none“, „cw“ — за 90 степени у смеру казаљке на сату, „half“"
-" — за 180 степени и „ccw“ — за 90 степени супротно смеру казаљке на сату."
+"Поставите ово на „none“, „cw“ — за 90 степени у смеру казаљке на сату, "
+"„half“ — за 180 степени и „ccw“ — за 90 степени супротно смеру казаљке на "
+"сату."
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:9
msgid "Wacom touch feature"
@@ -272,7 +266,6 @@
msgstr "Сам израчунава времена изласка и заласка Сунца, из текућег места."
#: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:11
-#| msgid "Charge time:"
msgid "The start time"
msgstr "Време покретања"
@@ -315,10 +308,6 @@
msgstr "Списак прикључака који могу бити учитани"
#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:2
-#| msgid ""
-#| "A list of strings representing the plugins that are allowed to be loaded "
-#| "(default: 'all'). The plugins still need to be marked as active to get "
-#| "loaded. This is only evaluated on startup."
msgid ""
"A list of strings representing the plugins that are allowed to be loaded "
"(default: “all”). This is only evaluated on startup."
@@ -706,12 +695,6 @@
msgstr "Датотека за подразумевана РандР подешавања"
#: ../data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in.h:2
-#| msgid ""
-#| "The XRandR plugin will look for a default configuration in the file "
-#| "specified by this key. This is similar to the ~/.config/monitors.xml that "
-#| "normally gets stored in users' home directories. If a user does not have "
-#| "such a file, or has one that does not match the user's setup of monitors, "
-#| "then the file specified by this key will be used instead."
msgid ""
"The XRandR plugin will look for a default configuration in the file "
"specified by this key. This is similar to the ~/.config/monitors.xml that "
@@ -729,12 +712,6 @@
msgstr "Да ли ће искључити одређене мониторе након покретања система"
#: ../data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in.h:4
-#| msgid ""
-#| "'clone' will display the same thing on all monitors, 'dock' will switch "
-#| "off the internal monitor, 'do-nothing' will use the default Xorg "
-#| "behaviour (extend the desktop in recent versions). The default, 'follow-"
-#| "lid', will choose between 'do-nothing' and 'dock' depending on whether "
-#| "the lid is (respectively) open or closed."
msgid ""
"“clone” will display the same thing on all monitors, “dock” will switch off "
"the internal monitor, “do-nothing” will use the default Xorg behaviour "
@@ -743,8 +720,8 @@
"(respectively) open or closed."
msgstr ""
"„clone“ ће приказивати исте ствари на свим мониторима, „dock“ ће искључити "
-"унутрашњи монитор, „do-nothing“ ће користити основно понашање Икс-орг-а ("
-"прошириће радну површ у новијим верзијама). Основно, „follow-lid“ ће "
+"унутрашњи монитор, „do-nothing“ ће користити основно понашање Икс-орг-а "
+"(прошириће радну површ у новијим верзијама). Основно, „follow-lid“ ће "
"изабрати између „do-nothing“ и „dock“ у зависности од тога да ли је либ "
"отворен или затворен."
@@ -753,10 +730,6 @@
msgstr "Умекшавање ивица"
#: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:2
-#| msgid ""
-#| "The type of antialiasing to use when rendering fonts. Possible values "
-#| "are: \"none\" for no antialiasing, \"grayscale\" for standard grayscale "
-#| "antialiasing, and \"rgba\" for subpixel antialiasing (LCD screens only)."
msgid ""
"The type of antialiasing to use when rendering fonts. Possible values are: "
"“none” for no antialiasing, “grayscale” for standard grayscale antialiasing, "
@@ -776,17 +749,6 @@
msgstr "Дотеривање"
#: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:4
-#| msgid ""
-#| "The type of hinting to use when rendering fonts. Possible values are: "
-#| "\"none\" for no hinting and \"slight\" for fitting only to the Y-axis "
-#| "like Microsoft's ClearType, DirectWrite and Adobe's proprietary font "
-#| "rendering engine. Ignores native hinting within the font, generates hints "
-#| "algorithmically. Used on Ubuntu by default. Recommended. The meaning of "
-#| "\"medium\" and \"full\" depends on the font format (.ttf, .otf, .pfa/."
-#| "pfb) and the installed version of FreeType. They usually try to fit "
-#| "glyphs to both the X and the Y axis (except for .otf: Y-only). This can "
-#| "lead to distortion and/or inconsistent rendering depending on the quality "
-#| "of the font, the font format and the state of FreeType's font engines."
msgid ""
"The type of hinting to use when rendering fonts. Possible values are: “none” "
"for no hinting and “slight” for fitting only to the Y-axis like Microsoft’s "
@@ -804,8 +766,8 @@
"Мајкрософтов „ClearType“, „DirectWrite“ и Адобов погон исцртавања власничког "
"словног лика. Занемарује изворно наговештавање унутар словног лика, "
"стварајући наговештаје алгоритамски. На Убунтуу се користи по основи. "
-"Препоручено. Значење за „medium“ и „full“ зависи од записа словног лика ("
-".ttf, .otf, .pfa/.pfb) и инсталираног издања „FreeType“-а. Обично покушавају "
+"Препоручено. Значење за „medium“ и „full“ зависи од записа словног лика (."
+"ttf, .otf, .pfa/.pfb) и инсталираног издања „FreeType“-а. Обично покушавају "
"да испуне глифове и до X и до Y осе (изузев за „.otf“: само Y). Ово може "
"довести до изобличења и/или непостојности исцртавања у зависности од "
"квалитета словног лика, записа словног лика и стања погона словног лика "
@@ -816,11 +778,6 @@
msgstr "Редослед РГБА"
#: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:6
-#| msgid ""
-#| "The order of subpixel elements on an LCD screen; only used when "
-#| "antialiasing is set to \"rgba\". Possible values are: \"rgb\" for red on "
-#| "left (most common), \"bgr\" for blue on left, \"vrgb\" for red on top, "
-#| "\"vbgr\" for red on bottom."
msgid ""
"The order of subpixel elements on an LCD screen; only used when antialiasing "
"is set to “rgba”. Possible values are: “rgb” for red on left (most common), "
@@ -868,7 +825,7 @@
"You just held down the Shift key for 8 seconds. This is the shortcut for "
"the Slow Keys feature, which affects the way your keyboard works."
msgstr ""
-"Управо сте држали тастер Шифт притиснут 8 секунди. Ово је пречица за "
+"Управо сте држали тастер Shift притиснут 8 секунди. Ово је пречица за "
"могућност спорих тастера, која утиче на то како ради ваша тастатура."
#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:410
@@ -909,7 +866,7 @@
"You just pressed the Shift key 5 times in a row. This is the shortcut for "
"the Sticky Keys feature, which affects the way your keyboard works."
msgstr ""
-"Управо сте притиснули тастер Шифт пет пута заредом. Ово је пречица за "
+"Управо сте притиснули тастер Shift пет пута заредом. Ово је пречица за "
"могућност лепљивих тастера, која утиче на начин рада ваше тастатуре."
#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:468
@@ -918,7 +875,7 @@
"row. This turns off the Sticky Keys feature, which affects the way your "
"keyboard works."
msgstr ""
-"Управо сте притиснули два тастера истовремено, или сте притиснули Шифт 5 "
+"Управо сте притиснули два тастера истовремено, или сте притиснули Shift 5 "
"пута заредом. Ово искључује могућност лепљивих тастера, што утиче на то "
"како ваша тастатура ради."
@@ -939,14 +896,12 @@
#. TRANSLATORS: this is when the display has not been recalibrated in a while
#: ../plugins/color/gsd-color-calibrate.c:199
#, c-format
-#| msgid "The display '%s' should be recalibrated soon."
msgid "The display “%s” should be recalibrated soon."
msgstr "Екран „%s“ треба бити ускоро поново подешен."
#. TRANSLATORS: this is when the printer has not been recalibrated in a while
#: ../plugins/color/gsd-color-calibrate.c:208
#, c-format
-#| msgid "The printer '%s' should be recalibrated soon."
msgid "The printer “%s” should be recalibrated soon."
msgstr "Штампач „%s“ треба бити ускоро поново подешен."
@@ -1038,30 +993,30 @@
msgid "This computer has only %s disk space remaining."
msgstr "Овај рачунар има само %s преосталог простора."
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2173
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2176
msgid "Bluetooth disabled"
msgstr "Блутут је искључен"
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2176
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2179
msgid "Bluetooth enabled"
msgstr "Блутут је укључен"
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2180
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2183
msgid "Airplane mode enabled"
msgstr "Режим у авиону је укључен"
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2183
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2186
msgid "Airplane mode disabled"
msgstr "Режим у авиону је искључен"
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2211
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2214
msgid "Hardware Airplane Mode"
msgstr "Хардверски режим у авиону"
#. Translators: this is a filename used for screencast
#. * recording, where "%d" and "%t" date and time, e.g.
#. * "Screencast from 07-17-2013 10:00:46 PM.webm"
-#: ../plugins/media-keys/gsd-media-keys-manager.c:2271
+#: ../plugins/media-keys/gsd-media-keys-manager.c:2274
#, no-c-format
msgid "Screencast from %d %t.webm"
msgstr "Запис екрана са %d %t.webm"
@@ -1224,12 +1179,12 @@
msgid "Battery Status"
msgstr "Стање батерије"
-#: ../plugins/media-keys/shortcuts-list.h:111
-#: ../plugins/media-keys/shortcuts-list.h:112
+#: ../plugins/media-keys/shortcuts-list.h:113
+#: ../plugins/media-keys/shortcuts-list.h:114
msgid "Toggle Airplane Mode"
msgstr "Окини режим у авиону"
-#: ../plugins/media-keys/shortcuts-list.h:113
+#: ../plugins/media-keys/shortcuts-list.h:115
msgid "Toggle Bluetooth"
msgstr "Окини блутут"
@@ -1630,7 +1585,6 @@
#. Translators: Just wait
#: ../plugins/print-notifications/gsd-printer.c:892
-#| msgid "Please wait..."
msgid "Please wait…"
msgstr "Молим сачекајте…"
@@ -1661,84 +1615,72 @@
#. Translators: The printer is low on toner (same as in system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:350
#, c-format
-#| msgid "Printer '%s' is low on toner."
msgid "Printer “%s” is low on toner."
msgstr "Тонер је скоро празан у штампачу „%s“."
#. Translators: The printer has no toner left (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:354
#, c-format
-#| msgid "Printer '%s' has no toner left."
msgid "Printer “%s” has no toner left."
msgstr "Нема више тонера у штампачу „%s“."
#. Translators: The printer is in the process of connecting to a shared
network output device (same as in system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:358
#, c-format
-#| msgid "Printer '%s' may not be connected."
msgid "Printer “%s” may not be connected."
msgstr "Штампач „%s“ можда није повезан."
#. Translators: One or more covers on the printer are open (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:362
#, c-format
-#| msgid "The cover is open on printer '%s'."
msgid "The cover is open on printer “%s”."
msgstr "Отворен је поклопац на штампачу „%s“."
#. Translators: A filter or backend is not installed (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:366
#, c-format
-#| msgid "There is a missing print filter for printer '%s'."
msgid "There is a missing print filter for printer “%s”."
msgstr "Недостаје филтер штампе за штампач „%s“."
#. Translators: One or more doors on the printer are open (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:371
#, c-format
-#| msgid "The door is open on printer '%s'."
msgid "The door is open on printer “%s”."
msgstr "Вратанца су отворена на штампачу „%s“."
#. Translators: "marker" is one color bin of the printer
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:375
#, c-format
-#| msgid "Printer '%s' is low on a marker supply."
msgid "Printer “%s” is low on a marker supply."
msgstr "Преостало је мало мастила у штампачу „%s“."
#. Translators: "marker" is one color bin of the printer
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:379
#, c-format
-#| msgid "Printer '%s' is out of a marker supply."
msgid "Printer “%s” is out of a marker supply."
msgstr "Нема више мастила у штампачу „%s“."
#. Translators: At least one input tray is low on media (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:383
#, c-format
-#| msgid "Printer '%s' is low on paper."
msgid "Printer “%s” is low on paper."
msgstr "Преостало је мало папира у штампачу „%s“."
#. Translators: At least one input tray is empty (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:387
#, c-format
-#| msgid "Printer '%s' is out of paper."
msgid "Printer “%s” is out of paper."
msgstr "Нема више папира у штампачу „%s“."
#. Translators: The printer is offline (same as in system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:391
#, c-format
-#| msgid "Printer '%s' is currently off-line."
msgid "Printer “%s” is currently off-line."
msgstr "Штампач „%s“ је тренутно ван мреже."
#. Translators: The printer has detected an error (same as in
system-config-printer)
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:395
#, c-format
-#| msgid "There is a problem on printer '%s'."
msgid "There is a problem on printer “%s”."
msgstr "Дошло је до проблема на штампачу „%s“."
@@ -1828,8 +1770,6 @@
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:594
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:607
#, c-format
-#| msgctxt "print job"
-#| msgid "\"%s\" on %s"
msgctxt "print job"
msgid "“%s” on %s"
msgstr "Посао „%s“ на штампачу „%s“"
@@ -1883,7 +1823,6 @@
#. Translators: "Printer 'MyPrinterName': 'Description of the
report/warning/error from a PPD file'."
#: ../plugins/print-notifications/gsd-print-notifications-manager.c:835
#, c-format
-#| msgid "Printer '%s': '%s'."
msgid "Printer “%s”: “%s”."
msgstr "Штампач „%s“: „%s“."
