Hello community, here is the log from the commit of package cinnamon-settings-daemon for openSUSE:Factory checked in at 2018-06-27 10:23:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon" Wed Jun 27 10:23:17 2018 rev:15 rq:619234 version:3.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes 2018-05-18 14:28:03.286036414 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new/cinnamon-settings-daemon.changes 2018-06-27 10:23:19.583869421 +0200 @@ -1,0 +2,14 @@ +Tue Jun 26 17:30:24 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 3.8.4: + * Power: Reconfigure idle timers when upower state changes. + +------------------------------------------------------------------- +Sat Jun 16 15:48:41 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 3.8.3: + * csd-xsettings-manager.c: Handle any window button layout when + adding the "menu" item to CSD window controls, not just our + default layout. + +------------------------------------------------------------------- Old: ---- cinnamon-settings-daemon-3.8.2.tar.gz New: ---- cinnamon-settings-daemon-3.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.62fcxl/_old 2018-06-27 10:23:20.215846377 +0200 +++ /var/tmp/diff_new_pack.62fcxl/_new 2018-06-27 10:23:20.223846085 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-settings-daemon -Version: 3.8.2 +Version: 3.8.4 Release: 0 Summary: The settings Daemon for the Cinnamon Desktop License: GPL-2.0-or-later AND LGPL-2.1-only ++++++ cinnamon-settings-daemon-3.8.2.tar.gz -> cinnamon-settings-daemon-3.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.2/configure.ac new/cinnamon-settings-daemon-3.8.4/configure.ac --- old/cinnamon-settings-daemon-3.8.2/configure.ac 2018-05-16 19:41:09.000000000 +0200 +++ new/cinnamon-settings-daemon-3.8.4/configure.ac 2018-06-22 20:58:17.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) AC_INIT([cinnamon-settings-daemon], - [3.8.2], + [3.8.4], [https://github.com/linuxmint/cinnamon-settings-daemon/issues]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.2/debian/changelog new/cinnamon-settings-daemon-3.8.4/debian/changelog --- old/cinnamon-settings-daemon-3.8.2/debian/changelog 2018-05-16 19:41:09.000000000 +0200 +++ new/cinnamon-settings-daemon-3.8.4/debian/changelog 2018-06-22 20:58:17.000000000 +0200 @@ -1,3 +1,16 @@ +cinnamon-settings-daemon (3.8.4) tara; urgency=medium + + * Power: Reconfigure idle timers when upower state changes + + -- Clement Lefebvre <r...@linuxmint.com> Fri, 22 Jun 2018 20:57:51 +0200 + +cinnamon-settings-daemon (3.8.3) tara; urgency=medium + + [ Michael Webster ] + * csd-xsettings-manager.c: Handle any window button layout when adding the 'menu' item to CSD window controls, not just our default layout. + + -- Clement Lefebvre <r...@linuxmint.com> Fri, 08 Jun 2018 11:49:11 +0100 + cinnamon-settings-daemon (3.8.2) tara; urgency=medium * CSD: Add menu to CSD windows when the layout is :minimize,maximize,close diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.2/plugins/power/csd-power-manager.c new/cinnamon-settings-daemon-3.8.4/plugins/power/csd-power-manager.c --- old/cinnamon-settings-daemon-3.8.2/plugins/power/csd-power-manager.c 2018-05-16 19:41:09.000000000 +0200 +++ new/cinnamon-settings-daemon-3.8.4/plugins/power/csd-power-manager.c 2018-06-22 20:58:17.000000000 +0200 @@ -3507,6 +3507,14 @@ } static void +up_client_on_battery_cb (UpClient *client, + GParamSpec *pspec, + CsdPowerManager *manager) +{ + idle_configure (manager); +} + +static void csd_power_manager_class_init (CsdPowerManagerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -4184,6 +4192,9 @@ #if UP_CHECK_VERSION(0,99,0) g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed", G_CALLBACK (lid_state_changed_cb), manager); + + g_signal_connect (manager->priv->up_client, "notify::on-battery", + G_CALLBACK (up_client_on_battery_cb), manager); #else g_signal_connect (manager->priv->up_client, "device-changed", G_CALLBACK (engine_device_changed_cb), manager); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.2/plugins/xsettings/csd-xsettings-manager.c new/cinnamon-settings-daemon-3.8.4/plugins/xsettings/csd-xsettings-manager.c --- old/cinnamon-settings-daemon-3.8.2/plugins/xsettings/csd-xsettings-manager.c 2018-05-16 19:41:09.000000000 +0200 +++ new/cinnamon-settings-daemon-3.8.4/plugins/xsettings/csd-xsettings-manager.c 2018-06-22 20:58:17.000000000 +0200 @@ -344,21 +344,53 @@ { int i; const char *tmp; + gchar *ptr, *final_str; /* This is kind of a workaround. "menu" is useless in metacity titlebars * it duplicates the same features as the right-click menu. * In CSD windows on the hand it is required to show unique featues. */ + tmp = g_variant_get_string (value, NULL); - if (tmp && strcmp (tmp, ":minimize,maximize,close") == 0) { - tmp = "menu:minimize,maximize,close"; + + /* Check if menu is in the setting string already */ + ptr = g_strstr_len (tmp, -1, "menu"); + + if (!ptr) { + /* If it wasn't there already, we add it... */ + + /* Simple cases, :* - all items on right, just prepend menu on left side*/ + if (g_str_has_prefix (tmp, ":")) { + final_str = g_strdup_printf ("menu%s", tmp); + } + else + /* All items on left... * (no :), append menu - we want actual window + controls on the outside */ + if (!g_strstr_len (tmp, -1, ":")) { + final_str = g_strdup_printf ("%s,menu", tmp); + } + else { + /* Items on both sides, split it, append menu to the lefthand, and re- + * construct the string with the : separator */ + + gchar **split = g_strsplit (tmp, ":", 2); + + final_str = g_strdup_printf ("%s,menu:%s", split[0], split[1]); + + g_strfreev (split); + } + } else { + /* If menu was already included, just copy the original string */ + final_str = g_strdup (tmp); } for (i = 0; manager->priv->managers [i]; i++) { xsettings_manager_set_string (manager->priv->managers [i], trans->xsetting_name, - tmp); + final_str); } + + g_free (final_str); } static TranslationEntry translations [] = {