commit cinnamon-session for openSUSE:Factory
Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2017-06-23 09:18:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-session" Fri Jun 23 09:18:01 2017 rev:9 rq:505526 version:3.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2017-05-27 13:14:51.757214464 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2017-06-23 09:18:37.616212795 +0200 @@ -1,0 +2,9 @@ +Wed Jun 21 16:11:48 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 3.4.1: + * autostart-blacklist: Add the new gnome settings daemon prefix. + * csm-manager.c: Listen to the power schema "lock-on-suspend" + setting instead of the normal screensaver setting of + "lock when the screensaver starts". + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.4.0.tar.gz New: ---- cinnamon-session-3.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.8xJqPp/_old 2017-06-23 09:18:38.184132547 +0200 +++ /var/tmp/diff_new_pack.8xJqPp/_new 2017-06-23 09:18:38.188131982 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-session -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: The session manager for the Cinnamon Desktop License: GPL-2.0+ and LGPL-2.1+ ++++++ cinnamon-session-3.4.0.tar.gz -> cinnamon-session-3.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.4.0/cinnamon-session/csm-manager.c new/cinnamon-session-3.4.1/cinnamon-session/csm-manager.c --- old/cinnamon-session-3.4.0/cinnamon-session/csm-manager.c 2017-05-04 14:38:10.000000000 +0200 +++ new/cinnamon-session-3.4.1/cinnamon-session/csm-manager.c 2017-06-20 15:27:44.000000000 +0200 @@ -95,8 +95,8 @@ #define KEY_SHOW_FALLBACK_WARNING "show-fallback-warning" #define KEY_BLACKLIST "autostart-blacklist" -#define SCREENSAVER_SCHEMA "org.cinnamon.desktop.screensaver" -#define KEY_SLEEP_LOCK "lock-enabled" +#define POWER_SETTINGS_SCHEMA "org.cinnamon.settings-daemon.plugins.power" +#define KEY_LOCK_ON_SUSPEND "lock-on-suspend" #define LOCKDOWN_SCHEMA "org.cinnamon.desktop.lockdown" #define KEY_DISABLE_LOG_OUT "disable-log-out" @@ -152,7 +152,7 @@ GSettings *settings; GSettings *session_settings; - GSettings *screensaver_settings; + GSettings *power_settings; GSettings *lockdown_settings; CsmSystem *system; @@ -1111,8 +1111,8 @@ static gboolean sleep_lock_is_enabled (CsmManager *manager) { - return g_settings_get_boolean (manager->priv->screensaver_settings, - KEY_SLEEP_LOCK); + return g_settings_get_boolean (manager->priv->power_settings, + KEY_LOCK_ON_SUSPEND); } static void @@ -1121,7 +1121,7 @@ GError *error; gboolean ret; - /* only lock if gnome-screensaver is set to lock */ + /* only lock if the user has selected 'lock-on-suspend' in power prefs */ if (!sleep_lock_is_enabled (manager)) { return; } @@ -2700,9 +2700,9 @@ manager->priv->session_settings = NULL; } - if (manager->priv->screensaver_settings) { - g_object_unref (manager->priv->screensaver_settings); - manager->priv->screensaver_settings = NULL; + if (manager->priv->power_settings) { + g_object_unref (manager->priv->power_settings); + manager->priv->power_settings = NULL; } if (manager->priv->lockdown_settings) { @@ -2901,7 +2901,7 @@ manager->priv->settings = g_settings_new (CSM_MANAGER_SCHEMA); manager->priv->session_settings = g_settings_new (SESSION_SCHEMA); - manager->priv->screensaver_settings = g_settings_new (SCREENSAVER_SCHEMA); + manager->priv->power_settings = g_settings_new (POWER_SETTINGS_SCHEMA); manager->priv->lockdown_settings = g_settings_new (LOCKDOWN_SCHEMA); manager->priv->inhibitors = csm_store_new (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.4.0/configure.ac new/cinnamon-session-3.4.1/configure.ac --- old/cinnamon-session-3.4.0/configure.ac 2017-05-04 14:38:10.000000000 +0200 +++ new/cinnamon-session-3.4.1/configure.ac 2017-06-20 15:27:44.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([cinnamon-session], - [3.4.0], + [3.4.1], [https://github.com/linuxmint/cinnamon-session/issues]) AC_CONFIG_SRCDIR([cinnamon-session]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.4.0/data/org.cinnamon.SessionManager.gschema.xml.in new/cinnamon-session-3.4.1/data/org.cinnamon.SessionManager.gschema.xml.in --- old/cinnamon-session-3.4.0/data/org.cinnamon.SessionManager.gschema.xml.in 2017-05-04 14:38:10.000000000 +0200 +++ new/cinnamon-session-3.4.1/data/org.cinnamon.SessionManager.gschema.xml.in 2017-06-20 15:27:44.000000000 +0200 @@ -21,7 +21,7 @@ <description>If enabled, cinnamon-session will display a warning dialog after login if the session was automatically fallen back.</description> </key> <key name="autostart-blacklist" type="as"> - <default>['gnome-settings-daemon', 'gnome-fallback-mount-helper', 'gnome-screensaver', 'mate-screensaver', 'mate-keyring-daemon', 'indicator-session', 'gnome-initial-setup-copy-worker', 'gnome-initial-setup-first-login', 'gnome-welcome-tour', 'xscreensaver-autostart', 'nautilus-autostart', 'caja', 'xfce4-power-manager']</default> + <default>['gnome-settings-daemon', 'org.gnome.SettingsDaemon', 'gnome-fallback-mount-helper', 'gnome-screensaver', 'mate-screensaver', 'mate-keyring-daemon', 'indicator-session', 'gnome-initial-setup-copy-worker', 'gnome-initial-setup-first-login', 'gnome-welcome-tour', 'xscreensaver-autostart', 'nautilus-autostart', 'caja', 'xfce4-power-manager']</default> <summary>Applications to block from autostarting or appearing in the app system</summary> <description> A list of applications or desktop names (without the .desktop extension) to prevent from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.4.0/debian/changelog new/cinnamon-session-3.4.1/debian/changelog --- old/cinnamon-session-3.4.0/debian/changelog 2017-05-04 14:38:10.000000000 +0200 +++ new/cinnamon-session-3.4.1/debian/changelog 2017-06-20 15:27:44.000000000 +0200 @@ -1,3 +1,13 @@ +cinnamon-session (3.4.1) sonya; urgency=medium + + [ itzexor ] + * autostart-blacklist: add new gnome settings daemon prefix + + [ Michael Webster ] + * csm-manager.c: Listen to the power schema 'lock-on-suspend' setting instead of the normal screensaver setting of 'lock when the screensaver starts'. + + -- Clement Lefebvre <root@linuxmint.com> Tue, 20 Jun 2017 15:27:12 +0200 + cinnamon-session (3.4.0) sonya; urgency=medium [ leigh123linux ]
participants (1)
-
root@hilbert.suse.de