Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2016-05-23 16:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2016-04-28 17:01:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2016-05-23 16:40:07.000000000 +0200 @@ -1,0 +2,10 @@ +Sun May 22 15:13:43 UTC 2016 - [email protected] + +- Update to version 3.0.1: + * Add support PreDisplayServer phase to fix gnome-keyring ssh + issue. + * Add new phase: CSM_MANAGER_PHASE_EARLY_INITIALIZATION, it's + needed for PRE_DISPLAY_SERVER phase to run. + * main.c: Add support for disabling gtk overlay scrollbars. + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.0.0.tar.gz New: ---- cinnamon-session-3.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.A04V6n/_old 2016-05-23 16:40:09.000000000 +0200 +++ /var/tmp/diff_new_pack.A04V6n/_new 2016-05-23 16:40:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-session -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: The session manager for the Cinnamon Desktop License: GPL-2.0+ and LGPL-2.1+ ++++++ cinnamon-session-3.0.0.tar.gz -> cinnamon-session-3.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/cinnamon-session/README new/cinnamon-session-3.0.1/cinnamon-session/README --- old/cinnamon-session-3.0.0/cinnamon-session/README 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/cinnamon-session/README 2016-05-20 13:03:13.000000000 +0200 @@ -9,14 +9,20 @@ (CsmAppAutostart represents an autostarted app, and CsmAppResumed represents an app resumed from the previous saved session.) -Startup is divided into 6 phases (CsmSessionPhase): +Startup is divided into 7 phases (CsmSessionPhase): * CSM_SESSION_PHASE_STARTUP covers cinnamon-session's internal startup, which also includes starting gconfd and dbus-daemon (if it's not already running). Gnome-session starts up those explicitly because it needs them for its own purposes. - * CSM_SESSION_PHASE_INITIALIZATION is the first phase of "normal" + * CSM_SESSION_PHASE_EARLY_INITIALIZATION is the first phase of + "normal" startup (ie, startup controlled by .desktop files + rather than hardcoding). It covers the possible installation of + files in $HOME by cinnamon-initial-setup and must be done before + other components such as gnome-keyring use those files. + + * CSM_SESSION_PHASE_INITIALIZATION covers low-level stuff like startup (ie, startup controlled by .desktop files rather than hardcoding). It covers low-level stuff like gnome-settings-daemon and at-spi-registryd, that need to be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/cinnamon-session/csm-autostart-app.c new/cinnamon-session-3.0.1/cinnamon-session/csm-autostart-app.c --- old/cinnamon-session-3.0.0/cinnamon-session/csm-autostart-app.c 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/cinnamon-session/csm-autostart-app.c 2016-05-20 13:03:13.000000000 +0200 @@ -617,7 +617,11 @@ CSM_AUTOSTART_APP_PHASE_KEY, NULL); if (phase_str != NULL) { - if (strcmp (phase_str, "Initialization") == 0) { + if (strcmp (phase_str, "EarlyInitialization") == 0) { + phase = CSM_MANAGER_PHASE_EARLY_INITIALIZATION; + } else if (strcmp (phase_str, "PreDisplayServer") == 0) { + phase = CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER; + } else if (strcmp (phase_str, "Initialization") == 0) { phase = CSM_MANAGER_PHASE_INITIALIZATION; } else if (strcmp (phase_str, "WindowManager") == 0) { phase = CSM_MANAGER_PHASE_WINDOW_MANAGER; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/cinnamon-session/csm-manager.c new/cinnamon-session-3.0.1/cinnamon-session/csm-manager.c --- old/cinnamon-session-3.0.0/cinnamon-session/csm-manager.c 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/cinnamon-session/csm-manager.c 2016-05-20 13:03:13.000000000 +0200 @@ -423,6 +423,12 @@ case CSM_MANAGER_PHASE_STARTUP: name = "STARTUP"; break; + case CSM_MANAGER_PHASE_EARLY_INITIALIZATION: + name = "EARLY_INITIALIZATION"; + break; + case CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER: + name = "PRE_DISPLAY_SERVER"; + break; case CSM_MANAGER_PHASE_INITIALIZATION: name = "INITIALIZATION"; break; @@ -543,6 +549,8 @@ switch (manager->priv->phase) { case CSM_MANAGER_PHASE_STARTUP: + case CSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER: case CSM_MANAGER_PHASE_INITIALIZATION: case CSM_MANAGER_PHASE_WINDOW_MANAGER: case CSM_MANAGER_PHASE_PANEL: @@ -686,6 +694,8 @@ switch (manager->priv->phase) { case CSM_MANAGER_PHASE_STARTUP: + case CSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER: case CSM_MANAGER_PHASE_INITIALIZATION: case CSM_MANAGER_PHASE_WINDOW_MANAGER: case CSM_MANAGER_PHASE_PANEL: @@ -1606,6 +1616,8 @@ switch (manager->priv->phase) { case CSM_MANAGER_PHASE_STARTUP: + case CSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER: case CSM_MANAGER_PHASE_INITIALIZATION: case CSM_MANAGER_PHASE_WINDOW_MANAGER: case CSM_MANAGER_PHASE_PANEL: @@ -1663,7 +1675,7 @@ guint phase; g_debug ("CsmManager: App startup summary"); - for (phase = CSM_MANAGER_PHASE_INITIALIZATION; phase < CSM_MANAGER_PHASE_RUNNING; phase++) { + for (phase = CSM_MANAGER_PHASE_EARLY_INITIALIZATION; phase < CSM_MANAGER_PHASE_RUNNING; phase++) { g_debug ("CsmManager: Phase %s", phase_num_to_name (phase)); csm_store_foreach (manager->priv->apps, (CsmStoreFunc)_debug_app_for_phase, @@ -1679,7 +1691,7 @@ g_return_if_fail (CSM_IS_MANAGER (manager)); csm_xsmp_server_start (manager->priv->xsmp_server); - csm_manager_set_phase (manager, CSM_MANAGER_PHASE_INITIALIZATION); + csm_manager_set_phase (manager, CSM_MANAGER_PHASE_EARLY_INITIALIZATION); debug_app_summary (manager); start_phase (manager); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/cinnamon-session/csm-manager.h new/cinnamon-session-3.0.1/cinnamon-session/csm-manager.h --- old/cinnamon-session-3.0.0/cinnamon-session/csm-manager.h 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/cinnamon-session/csm-manager.h 2016-05-20 13:03:13.000000000 +0200 @@ -68,6 +68,10 @@ typedef enum { /* csm's own startup/initialization phase */ CSM_MANAGER_PHASE_STARTUP = 0, + /* gnome-initial-setup */ + CSM_MANAGER_PHASE_EARLY_INITIALIZATION, + /* gnome-keyring-daemon */ + CSM_MANAGER_PHASE_PRE_DISPLAY_SERVER, /* xrandr setup, gnome-settings-daemon, etc */ CSM_MANAGER_PHASE_INITIALIZATION, /* window/compositing managers */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/cinnamon-session/main.c new/cinnamon-session-3.0.1/cinnamon-session/main.c --- old/cinnamon-session-3.0.0/cinnamon-session/main.c 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/cinnamon-session/main.c 2016-05-20 13:03:13.000000000 +0200 @@ -306,11 +306,13 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - GSettings *settings = g_settings_new ("org.cinnamon.SessionManager"); + GSettings *settings; + + settings = g_settings_new ("org.cinnamon.SessionManager"); if (g_settings_get_boolean (settings, "debug")) { debug = TRUE; } - g_object_unref(settings); + g_clear_object (&settings); sa.sa_handler = SIG_IGN; sa.sa_flags = 0; @@ -384,6 +386,17 @@ /* Make QT5 apps follow the GTK style */ csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk"); + /* GTK Overlay scrollbars */ + settings = g_settings_new ("org.cinnamon.desktop.interface"); + + if (g_settings_get_boolean (settings, "gtk-overlay-scrollbars")) { + csm_util_setenv ("GTK_OVERLAY_SCROLLING", "1"); + } else { + csm_util_setenv ("GTK_OVERLAY_SCROLLING", "0"); + } + + g_clear_object (&settings); + client_store = csm_store_new (); /* Talk to logind before acquiring a name, since it does synchronous diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.0/configure.ac new/cinnamon-session-3.0.1/configure.ac --- old/cinnamon-session-3.0.0/configure.ac 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/configure.ac 2016-05-20 13:03:13.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([cinnamon-session], - [3.0.0], + [3.0.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.0.0/debian/changelog new/cinnamon-session-3.0.1/debian/changelog --- old/cinnamon-session-3.0.0/debian/changelog 2016-04-23 17:16:58.000000000 +0200 +++ new/cinnamon-session-3.0.1/debian/changelog 2016-05-20 13:03:13.000000000 +0200 @@ -1,3 +1,14 @@ +cinnamon-session (3.0.1) sarah; urgency=medium + + [ leigh123linux ] + * Add support PreDisplayServer phase to fix gnome-keyring ssh issue + * add new phase: CSM_MANAGER_PHASE_EARLY_INITIALIZATION, it's needed for PRE_DISPLAY_SERVER phase to run + + [ Michael Webster ] + * main.c: Add support for disabling gtk overlay scrollbars + + -- Clement Lefebvre <[email protected]> Fri, 20 May 2016 12:02:48 +0100 + cinnamon-session (3.0.0) sarah; urgency=medium [ Michael Webster ]
