Hello community, here is the log from the commit of package cinnamon-control-center for openSUSE:Factory checked in at 2017-11-21 15:34:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old) and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center" Tue Nov 21 15:34:51 2017 rev:10 rq:544084 version:3.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes 2017-11-19 11:13:17.791219167 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-control-center.new/cinnamon-control-center.changes 2017-11-21 15:35:03.071385119 +0100 @@ -1,0 +2,12 @@ +Tue Nov 21 07:11:21 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 3.6.5 (changes since 3.6.3): + * network: Avoid crashing if the NMDevice doesn't have a + hw-address. + * all: Simplify and fix i18n. + * online-accounts: Fix Gtk-warning. + * network: Enable loading of newer VPN plugins + (gh#linuxmint/cinnamon-control-center#183). + * all: Remove obsolete files and setup gitignore. + +------------------------------------------------------------------- Old: ---- cinnamon-control-center-3.6.3.tar.gz New: ---- cinnamon-control-center-3.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-control-center.spec ++++++ --- /var/tmp/diff_new_pack.qqzz13/_old 2017-11-21 15:35:07.419227565 +0100 +++ /var/tmp/diff_new_pack.qqzz13/_new 2017-11-21 15:35:07.423227420 +0100 @@ -19,7 +19,7 @@ %define soname libcinnamon-control-center %define sover 1 Name: cinnamon-control-center -Version: 3.6.3 +Version: 3.6.5 Release: 0 Summary: Utilities to configure the Cinnamon desktop License: GPL-2.0 AND GPL-3.0+ AND MIT ++++++ cinnamon-control-center-3.6.3.tar.gz -> cinnamon-control-center-3.6.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/.gitignore new/cinnamon-control-center-3.6.5/.gitignore --- old/cinnamon-control-center-3.6.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/.gitignore 2017-11-20 15:46:44.000000000 +0100 @@ -0,0 +1,45 @@ +# Autotools +autom4te.cache/ +m4/ +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +Makefile +Makefile.in +stamp-h1 +*.desktop +*.desktop.in +*.m4 +*.pc + +# Compiler output +*.la +*.lo +*.mo +*.o +.deps/ +.libs/ +*-resources.c +*-resources.h +panels/common/list-languages +panels/datetime/test-endianess +panels/datetime/test-timezone +panels/datetime/test-timezone-gfx +panels/wacom/calibrator/test-calibrator +panels/wacom/test-wacom +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +shell/cinnamon-control-center +shell/cinnamoncc.directory +shell/cinnamoncc.menu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/INSTALL new/cinnamon-control-center-3.6.5/INSTALL --- old/cinnamon-control-center-3.6.3/INSTALL 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/INSTALL 1970-01-01 01:00:00.000000000 +0100 @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/configure.ac new/cinnamon-control-center-3.6.5/configure.ac --- old/cinnamon-control-center-3.6.3/configure.ac 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/configure.ac 2017-11-20 15:46:44.000000000 +0100 @@ -1,4 +1,4 @@ -m4_define([cinnamon_control_center_version], 3.6.3) +m4_define([cinnamon_control_center_version], 3.6.5) AC_INIT([cinnamon-control-center], [cinnamon_control_center_version], [https://github.com/linuxmint/cinnamon-control-center/issues]) @@ -147,6 +147,8 @@ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION, [have_networkmanager=yes], have_networkmanager=no) + PKG_CHECK_MODULES(LIBNMA_1_8_0, libnma >= 1.8.0, + [have_nma_18=yes], have_nma_18=no) if test "x$have_networkmanager" = xno ; then AC_MSG_ERROR(*** NetworkManager not found ***) fi @@ -160,6 +162,10 @@ AC_SUBST(NM_VPN_CONFIG_DIR) AC_SUBST(NM_VPN_MODULE_DIR) fi + + if test x${have_nma_18} = xyes; then + AC_DEFINE(HAVE_NMA_18, 1, [Define to 1 if libnma ist >= 1.8.0]) + fi fi AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/debian/changelog new/cinnamon-control-center-3.6.5/debian/changelog --- old/cinnamon-control-center-3.6.3/debian/changelog 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/debian/changelog 2017-11-20 15:46:44.000000000 +0100 @@ -1,3 +1,23 @@ +cinnamon-control-center (3.6.5) sylvia; urgency=medium + + [ Björn Esser ] + * all: Simplify and fix i18n (#191) + * online-accounts: Fix Gtk-warning (#192) + * network: Enable loading of newer VPN plugins (fix #183) (#188) + * all: Remove obsolete files and setup gitignore (#190) + + [ Clement Lefebvre ] + * Fix Debian build + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 20 Nov 2017 14:46:06 +0000 + +cinnamon-control-center (3.6.4) sylvia; urgency=medium + + [ Leigh Scott ] + * network: Avoid crashing if the NMDevice doesn't have a hw-address (#187) + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 20 Nov 2017 09:42:35 +0000 + cinnamon-control-center (3.6.3) sylvia; urgency=medium [ JosephMcc ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/debian/rules new/cinnamon-control-center-3.6.5/debian/rules --- old/cinnamon-control-center-3.6.3/debian/rules 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/debian/rules 2017-11-20 15:46:44.000000000 +0100 @@ -10,6 +10,9 @@ %: dh $@ --parallel --with=autoreconf,gnome +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh + override_dh_gnome_clean: dh_gnome_clean --no-control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/color/cc-color-panel.c new/cinnamon-control-center-3.6.5/panels/color/cc-color-panel.c --- old/cinnamon-control-center-3.6.3/panels/color/cc-color-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/color/cc-color-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gio/gio.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include "cc-color-panel.h" #define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w) @@ -2484,8 +2484,6 @@ priv = prefs->priv = COLOR_PANEL_PRIVATE (prefs); priv->builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); - gtk_builder_add_from_file (priv->builder, CINNAMONCC_UI_DIR "/color.ui", &error); @@ -2676,6 +2674,7 @@ void cc_color_panel_register (GIOModule *module) { + textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_color_panel_register_type (G_TYPE_MODULE (module)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/color/color-module.c new/cinnamon-control-center-3.6.5/panels/color/color-module.c --- old/cinnamon-control-center-3.6.3/panels/color/color-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/color/color-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -24,7 +24,7 @@ #include "cc-color-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/common/cc-common-language.c new/cinnamon-control-center-3.6.5/panels/common/cc-common-language.c --- old/cinnamon-control-center-3.6.3/panels/common/cc-common-language.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/common/cc-common-language.c 2017-11-20 15:46:44.000000000 +0100 @@ -25,7 +25,7 @@ #include <locale.h> #include <glib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <fontconfig/fontconfig.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/common/cc-language-chooser.c new/cinnamon-control-center-3.6.5/panels/common/cc-language-chooser.c --- old/cinnamon-control-center-3.6.3/panels/common/cc-language-chooser.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/common/cc-language-chooser.c 2017-11-20 15:46:44.000000000 +0100 @@ -25,7 +25,7 @@ #include <locale.h> #include <glib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> @@ -287,7 +287,6 @@ GtkTreeModel *filter_model; builder = gtk_builder_new (); - gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); filename = UIDIR "/language-chooser.ui"; if (!g_file_test (filename, G_FILE_TEST_EXISTS)) filename = "data/language-chooser.ui"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/common/gdm-languages.c new/cinnamon-control-center-3.6.5/panels/common/gdm-languages.c --- old/cinnamon-control-center-3.6.3/panels/common/gdm-languages.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/common/gdm-languages.c 2017-11-20 15:46:44.000000000 +0100 @@ -34,7 +34,7 @@ #include <sys/stat.h> #include <glib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> #include "gdm-languages.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/common/list-languages.c new/cinnamon-control-center-3.6.5/panels/common/list-languages.c --- old/cinnamon-control-center-3.6.3/panels/common/list-languages.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/common/list-languages.c 2017-11-20 15:46:44.000000000 +0100 @@ -1,7 +1,7 @@ #include "config.h" #include <glib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <locale.h> #include <glib-object.h> #include "gdm-languages.h" @@ -12,6 +12,8 @@ guint i; setlocale (LC_ALL, NULL); + textdomain (GETTEXT_PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); g_type_init (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/datetime/cc-datetime-panel.c new/cinnamon-control-center-3.6.5/panels/datetime/cc-datetime-panel.c --- old/cinnamon-control-center-3.6.3/panels/datetime/cc-datetime-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/datetime/cc-datetime-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -903,8 +903,6 @@ } priv->builder = gtk_builder_new (); - - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); ret = gtk_builder_add_objects_from_file (priv->builder, DATADIR"/datetime.ui", objects, &err); @@ -1042,7 +1040,9 @@ void cc_date_time_panel_register (GIOModule *module) { - bind_textdomain_codeset (GETTEXT_PACKAGE_TIMEZONES, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_date_time_panel_register_type (G_TYPE_MODULE (module)); g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/datetime/datetime-module.c new/cinnamon-control-center-3.6.5/panels/datetime/datetime-module.c --- old/cinnamon-control-center-3.6.3/panels/datetime/datetime-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/datetime/datetime-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -23,19 +23,11 @@ #include "cc-datetime-panel.h" -#include <glib/gi18n-lib.h> - -#define GETTEXT_PACKAGE_TIMEZONES GETTEXT_PACKAGE "-timezones" +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) { - bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - bindtextdomain (GETTEXT_PACKAGE_TIMEZONES, "/usr/share/locale"); - bind_textdomain_codeset (GETTEXT_PACKAGE_TIMEZONES, "UTF-8"); - /* register the panel */ cc_date_time_panel_register (module); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/display/cc-display-panel.c new/cinnamon-control-center-3.6.5/panels/display/cc-display-panel.c --- old/cinnamon-control-center-3.6.3/panels/display/cc-display-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/display/cc-display-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -33,7 +33,7 @@ #include <libcinnamon-desktop/gnome-rr-config.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <libcinnamon-desktop/cdesktop-enums.h> #include "cc-rr-labeler.h" @@ -2507,7 +2507,6 @@ error = NULL; self->priv->builder = builder = gtk_builder_new (); - gtk_builder_set_translation_domain (self->priv->builder, GETTEXT_PACKAGE); if (!gtk_builder_add_objects_from_file (builder, UIDIR "/display-capplet.ui", objects, &error)) { g_warning ("Could not parse UI definition: %s", error->message); @@ -2603,6 +2602,7 @@ void cc_display_panel_register (GIOModule *module) { + textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_display_panel_register_type (G_TYPE_MODULE (module)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/display/cc-rr-labeler.c new/cinnamon-control-center-3.6.5/panels/display/cc-rr-labeler.c --- old/cinnamon-control-center-3.6.3/panels/display/cc-rr-labeler.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/display/cc-rr-labeler.c 2017-11-20 15:46:44.000000000 +0100 @@ -26,7 +26,7 @@ */ #include <config.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <X11/Xproto.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/display/display-module.c new/cinnamon-control-center-3.6.5/panels/display/display-module.c --- old/cinnamon-control-center-3.6.3/panels/display/display-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/display/display-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -23,7 +23,7 @@ #include "cc-display-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/network/cc-network-panel.c new/cinnamon-control-center-3.6.5/panels/network/cc-network-panel.c --- old/cinnamon-control-center-3.6.3/panels/network/cc-network-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/network/cc-network-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -45,6 +45,10 @@ #include <libmm-glib.h> #endif +#ifdef HAVE_NMA_18 +#include <nma-cert-chooser.h> +#endif + CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel) #define NETWORK_PANEL_PRIVATE(o) \ @@ -1290,6 +1294,12 @@ return; } +#ifdef HAVE_NMA_18 + /* some newer VPN plugins pre-require internal resources from libnma */ + /* this solution is really ugly, but works clean */ + gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE)); +#endif + panel->priv->cancellable = g_cancellable_new (); panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, @@ -1390,6 +1400,7 @@ void cc_network_panel_register (GIOModule *module) { + textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_network_panel_register_type (G_TYPE_MODULE (module)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/network/net-device-simple.c new/cinnamon-control-center-3.6.5/panels/network/net-device-simple.c --- old/cinnamon-control-center-3.6.3/panels/network/net-device-simple.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/network/net-device-simple.c 2017-11-20 15:46:44.000000000 +0100 @@ -85,7 +85,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple) { NetDeviceSimplePrivate *priv = device_simple->priv; - char *hwaddr; + const char *hwaddr; GtkWidget *widget; char *speed = NULL; NMDevice *nm_device; @@ -119,11 +119,8 @@ panel_set_device_status (priv->builder, "label_status", nm_device, speed); /* device MAC */ - g_object_get (G_OBJECT (nm_device), - "hw-address", &hwaddr, - NULL); + hwaddr = nm_device_get_hw_address (nm_device); panel_set_device_widget_details (priv->builder, "mac", hwaddr); - g_free (hwaddr); /* set IP entries */ panel_set_device_widgets (priv->builder, nm_device); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/network/network-module.c new/cinnamon-control-center-3.6.5/panels/network/network-module.c --- old/cinnamon-control-center-3.6.3/panels/network/network-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/network/network-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -18,7 +18,7 @@ #include <config.h> #include "cc-network-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/online-accounts/cc-online-accounts-panel.c new/cinnamon-control-center-3.6.5/panels/online-accounts/cc-online-accounts-panel.c --- old/cinnamon-control-center-3.6.3/panels/online-accounts/cc-online-accounts-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/online-accounts/cc-online-accounts-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -22,7 +22,7 @@ #include <gio/gio.h> #include <string.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #define GOA_API_IS_SUBJECT_TO_CHANGE #include <goa/goa.h> @@ -508,9 +508,9 @@ object_class->finalize = cc_goa_panel_finalize; object_class->dispose = cc_goa_panel_dispose; - g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); + //g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/online-accounts/online-accounts.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/cinnamon/control-center/online-accounts/online-accounts.ui"); gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, accounts_frame); gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, accounts_listbox); @@ -968,6 +968,7 @@ void cc_goa_panel_register (GIOModule *module) { + textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_goa_panel_register_type (G_TYPE_MODULE (module)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/online-accounts/online-accounts-module.c new/cinnamon-control-center-3.6.5/panels/online-accounts/online-accounts-module.c --- old/cinnamon-control-center-3.6.3/panels/online-accounts/online-accounts-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/online-accounts/online-accounts-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -18,7 +18,7 @@ #include <config.h> #include "cc-online-accounts-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/online-accounts/online-accounts.gresource.xml new/cinnamon-control-center-3.6.5/panels/online-accounts/online-accounts.gresource.xml --- old/cinnamon-control-center-3.6.3/panels/online-accounts/online-accounts.gresource.xml 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/online-accounts/online-accounts.gresource.xml 2017-11-20 15:46:44.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> - <gresource prefix="/org/gnome/control-center/online-accounts"> + <gresource prefix="/org/cinnamon/control-center/online-accounts"> <file preprocess="xml-stripblanks">online-accounts.ui</file> </gresource> </gresources> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/cc-region-panel.c new/cinnamon-control-center-3.6.5/panels/region/cc-region-panel.c --- old/cinnamon-control-center-3.6.3/panels/region/cc-region-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/cc-region-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -21,7 +21,7 @@ #include "config.h" #include "cc-region-panel.h" #include <gtk/gtk.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include "cinnamon-region-panel-xkb.h" @@ -105,7 +105,6 @@ desktop = g_getenv ("XDG_CURRENT_DESKTOP"); priv->builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); gtk_builder_add_from_file (priv->builder, CINNAMONCC_UI_DIR "/cinnamon-region-panel.ui", &error); @@ -128,8 +127,9 @@ void cc_region_panel_register (GIOModule * module) { - bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); cc_region_panel_register_type (G_TYPE_MODULE (module)); g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, CC_TYPE_REGION_PANEL, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkb.c new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkb.c --- old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkb.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkb.c 2017-11-20 15:46:44.000000000 +0100 @@ -25,7 +25,7 @@ #include <string.h> #include <gdk/gdkx.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include "cinnamon-region-panel-xkb.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkblt.c new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkblt.c --- old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkblt.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkblt.c 2017-11-20 15:46:44.000000000 +0100 @@ -24,7 +24,7 @@ #endif #include <gdk/gdkx.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <libgnomekbd/gkbd-desktop-config.h> #include <libgnomekbd/gkbd-keyboard-drawing.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkbltadd.c new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkbltadd.c --- old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkbltadd.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkbltadd.c 2017-11-20 15:46:44.000000000 +0100 @@ -378,7 +378,6 @@ GtkTreeSelection *selection; GtkListStore *model; GtkTreeModelFilter *filtered_model; - gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE); gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR "/cinnamon-region-panel-layout-chooser.ui", NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkbot.c new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkbot.c --- old/cinnamon-control-center-3.6.3/panels/region/cinnamon-region-panel-xkbot.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/cinnamon-region-panel-xkbot.c 2017-11-20 15:46:44.000000000 +0100 @@ -24,7 +24,7 @@ # include <config.h> #endif -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <string.h> #include "cinnamon-region-panel-xkb.h" @@ -442,7 +442,6 @@ GtkWidget *chooser; chooser_dialog = gtk_builder_new (); - gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE); gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR "/cinnamon-region-panel-options-dialog.ui", NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/region/region-module.c new/cinnamon-control-center-3.6.5/panels/region/region-module.c --- old/cinnamon-control-center-3.6.3/panels/region/region-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/region/region-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -23,7 +23,7 @@ #include "cc-region-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule * module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-page.c new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-page.c --- old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-page.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-page.c 2017-11-20 15:46:44.000000000 +0100 @@ -22,7 +22,7 @@ #include <config.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "cc-wacom-page.h" @@ -865,7 +865,6 @@ g_assert (priv->mapping_builder == NULL); priv->mapping_builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->mapping_builder, GETTEXT_PACKAGE); gtk_builder_add_from_resource (priv->mapping_builder, "/org/cinnamon/control-center/wacom/button-mapping.ui", &error); @@ -1125,7 +1124,6 @@ priv = self->priv = WACOM_PAGE_PRIVATE (self); priv->builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); gtk_builder_add_objects_from_resource (priv->builder, "/org/cinnamon/control-center/wacom/cinnamon-wacom-properties.ui", objects, @@ -1396,4 +1394,4 @@ "notebook", notebook, "ignore-first", ignore_first_page, NULL); -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-panel.c new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-panel.c --- old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-panel.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-panel.c 2017-11-20 15:46:44.000000000 +0100 @@ -24,7 +24,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include "cc-wacom-panel.h" #include "cc-wacom-page.h" @@ -318,7 +318,6 @@ g_resources_register (cc_wacom_get_resource ()); priv->builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); gtk_builder_add_objects_from_resource (priv->builder, "/org/cinnamon/control-center/wacom/cinnamon-wacom-properties.ui", objects, @@ -378,6 +377,7 @@ cc_wacom_panel_register (GIOModule *module) { cc_wacom_panel_register_type (G_TYPE_MODULE (module)); + textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-stylus-page.c new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-stylus-page.c --- old/cinnamon-control-center-3.6.3/panels/wacom/cc-wacom-stylus-page.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/wacom/cc-wacom-stylus-page.c 2017-11-20 15:46:44.000000000 +0100 @@ -300,7 +300,6 @@ priv = self->priv = WACOM_STYLUS_PAGE_PRIVATE (self); priv->builder = gtk_builder_new (); - gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE); gtk_builder_add_objects_from_resource (priv->builder, "/org/cinnamon/control-center/wacom/wacom-stylus-page.ui", objects, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/wacom/csd-wacom-device.c new/cinnamon-control-center-3.6.5/panels/wacom/csd-wacom-device.c --- old/cinnamon-control-center-3.6.3/panels/wacom/csd-wacom-device.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/wacom/csd-wacom-device.c 2017-11-20 15:46:44.000000000 +0100 @@ -22,7 +22,7 @@ #include "config.h" #include <glib.h> -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/panels/wacom/wacom-module.c new/cinnamon-control-center-3.6.5/panels/wacom/wacom-module.c --- old/cinnamon-control-center-3.6.3/panels/wacom/wacom-module.c 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/panels/wacom/wacom-module.c 2017-11-20 15:46:44.000000000 +0100 @@ -23,7 +23,7 @@ #include "cc-wacom-panel.h" -#include <glib/gi18n-lib.h> +#include <glib/gi18n.h> void g_io_module_load (GIOModule *module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.6.3/po/Makefile.in.in new/cinnamon-control-center-3.6.5/po/Makefile.in.in --- old/cinnamon-control-center-3.6.3/po/Makefile.in.in 2017-11-17 11:54:58.000000000 +0100 +++ new/cinnamon-control-center-3.6.5/po/Makefile.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,222 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drep...@gnu.ai.mit.edu> -# Copyright (C) 2004-2008 Rodney Dawes <dobey.p...@gmail.com> -# -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. -# -# - Modified by Owen Taylor <otay...@redhat.com> to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman <ja...@ximian.com> to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes <dobey.p...@gmail.com> for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) -INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< - -.po.gmo: - $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: