Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2016-03-16 10:35:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2016-01-22 01:06:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2016-03-16 10:35:12.000000000 +0100 @@ -1,0 +2,32 @@ +Wed Mar 9 18:09:32 UTC 2016 - [email protected] + +- Update to 2.8.7: + * cs_keyboard.py: Fix event handlers for teaching keybindings - + the cursor-down and -up keys were being incorrectly used to + navigate the tree view during teach mode, and it was breaking + focus (and cancelling the teach). + * magnifier: Limit max zoom to a reasonable value. + * menu applet: Fix vfade in the program list - it was only showing + when desktop zoom was turned entirely off. + We've reworked zoom since then, so that the .applications key + only determines whether we listen to key and mouse bindings or + not - actual zoom activation occurs only when the magnification + factor becomes > 1.0. + * screensaver: Fix proxy to listen to the correct service, fix + layout changes when the screensaver starts/stops. + * layout.js: Get an actual boolean from the screensaver proxy. + * signalManager.js: Pass argument array correctly, and don't wipe + out this._storage when filtering out disconnected items. + * cinnamonDBus: Rename Cinnamon to CinnamonDBus, and import + Cinnamon so screenshot calls work. + * window-list: Prevent the window list thumbnails from showing + when the applets context menu is open. + * window-list: Properly update the label in the window preview. + * cs_backgrounds: For an update of some of the reveal children + on initial page load to fix some settings not showing properly + * Fix D-Bus methods for screen capture. + * util.js: Do not modify error message. +- Rebase cinnamon-fix-backgrounds-lookup.patch, + cinnamon-favourite-applications.patch. + +------------------------------------------------------------------- Old: ---- cinnamon-2.8.6.tar.gz New: ---- cinnamon-2.8.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.tY3RXS/_old 2016-03-16 10:35:13.000000000 +0100 +++ /var/tmp/diff_new_pack.tY3RXS/_new 2016-03-16 10:35:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cinnamon # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 2.8.0 Name: cinnamon -Version: 2.8.6 +Version: 2.8.7 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ and LGPL-2.1 ++++++ cinnamon-2.8.6.tar.gz -> cinnamon-2.8.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/configure.ac new/Cinnamon-2.8.7/configure.ac --- old/Cinnamon-2.8.6/configure.ac 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/configure.ac 2016-03-07 18:22:23.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[2.8.6],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[2.8.7],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/cinnamon-global.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/debian/changelog new/Cinnamon-2.8.7/debian/changelog --- old/Cinnamon-2.8.6/debian/changelog 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/debian/changelog 2016-03-07 18:22:23.000000000 +0100 @@ -1,3 +1,27 @@ +cinnamon (2.8.7) rosa; urgency=medium + + [ Michael Webster ] + * cs_keyboard.py: Fix event handlers for teaching keybindings - the cursor-down and -up keys were being incorrectly used to navigate the tree view during teach mode, and it was breaking focus (and cancelling the teach.) + * magnifier: limit max zoom to a reasonable value + * menu applet: Fix vfade in the program list - it was only showing when desktop zoom was turned entirely off. We've reworked zoom since then, so that the .applications key only determines whether we listen to key and mouse bindings or not - actual zoom activation occurs only when the magnification factor becomes > 1.0. + * screensaver: Fix proxy to listen to the correct service, fix layout changes when the screensaver starts/stops. + * layout.js: get an actual boolean from the screensaver proxy. + * signalManager.js: pass argument array correctly, and don't wipe out this._storage when filtering out disconnected items. + * cinnamonDBus: rename Cinnamon to CinnamonDBus, and import Cinnamon so screenshot calls work. + + [ JosephMcc ] + * window-list: Prevent the window list thumbnails from showing when the applets context menu is open + * window-list: Properly update the label in the window preview. Fixes https://github.com/linuxmint/Cinnamon/issues/4879 + * cs_backgrounds: For an update of some of the reveal children on initial page load to fix some settings not showing properly + + [ Rob Adams ] + * Fix D-Bus methods for screen capture + + [ itzexor ] + * util.js: do not modify error message + + -- Clement Lefebvre <[email protected]> Mon, 07 Mar 2016 17:21:41 +0000 + cinnamon (2.8.6) rosa; urgency=medium [ JosephMcc ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-2.8.7/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-2.8.6/files/usr/share/cinnamon/applets/[email protected]/applet.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/files/usr/share/cinnamon/applets/[email protected]/applet.js 2016-03-07 18:22:23.000000000 +0100 @@ -2021,7 +2021,7 @@ } } else { - this._screenSaverProxy.LockRemote(); + this._screenSaverProxy.LockRemote(""); } }); @@ -2188,6 +2188,9 @@ this.a11y_settings = new Gio.Settings({ schema_id: "org.cinnamon.desktop.a11y.applications" }); this.a11y_settings.connect("changed::screen-magnifier-enabled", Lang.bind(this, this._updateVFade)); + this.a11y_mag_settings = new Gio.Settings({ schema_id: "org.cinnamon.desktop.a11y.magnifier" }); + this.a11y_mag_settings.connect("changed::mag-factor", Lang.bind(this, this._updateVFade)); + this._updateVFade(); this.settings.bindProperty(Settings.BindingDirection.IN, "enable-autoscroll", "autoscroll_enabled", this._update_autoscroll, null); @@ -2245,7 +2248,8 @@ }, _updateVFade: function() { - let mag_on = this.a11y_settings.get_boolean("screen-magnifier-enabled"); + let mag_on = this.a11y_settings.get_boolean("screen-magnifier-enabled") && + this.a11y_mag_settings.get_double("mag-factor") > 1.0; if (mag_on) { this.applicationsScrollBox.style_class = "menu-applications-scrollbox"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-2.8.7/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-2.8.6/files/usr/share/cinnamon/applets/[email protected]/applet.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/files/usr/share/cinnamon/applets/[email protected]/applet.js 2016-03-07 18:22:23.000000000 +0100 @@ -104,10 +104,10 @@ iconBox.set_child(icon); hbox.add_actor(iconBox); - let label = new St.Label(); - label.set_text(this.metaWindow.get_title()); - label.style = "padding: 2px;"; - hbox.add_actor(label); + this.label = new St.Label(); + this.label.set_text(this.metaWindow.get_title()); + this.label.style = "padding: 2px;"; + hbox.add_actor(this.label); box.add_actor(hbox); @@ -132,7 +132,7 @@ }, show: function() { - if (!this.actor) + if (!this.actor || this._applet._menuOpen) return let muffinWindow = this.metaWindow.get_compositor_private(); @@ -187,6 +187,10 @@ this.visible = false; }, + set_text: function(text) { + this.label.set_text(text); + }, + _destroy: function() { if (this.thumbnail) { this.thumbnailBin.set_child(null); @@ -793,6 +797,11 @@ }, _onToggled: function(actor, isOpening){ + if (this.isOpen) + this._launcher._applet._menuOpen = true; + else + this._launcher._applet._menuOpen = false; + if (!isOpening) { return; } @@ -818,6 +827,7 @@ this.dragInProgress = false; this._tooltipShowing = false; this._tooltipErodeTimer = null; + this._menuOpen = false; this._urgentSignal = null; this._windows = []; this._monitorWatchList = []; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py new/Cinnamon-2.8.7/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py --- old/Cinnamon-2.8.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py 2016-03-07 18:22:23.000000000 +0100 @@ -205,6 +205,8 @@ widget = GSettingsColorChooser(_("Gradient end color"), "org.cinnamon.desktop.background", "secondary-color", size_group=size_group) self.secondary_color_revealer = settings.add_reveal_row(widget) + self.update_secondary_revealer(self._background_schema, None) + def is_row_separator(self, model, iter, data): return model.get_value(iter, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py new/Cinnamon-2.8.7/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py --- old/Cinnamon-2.8.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py 2016-03-07 18:22:23.000000000 +0100 @@ -853,7 +853,9 @@ self.connect("editing-started", self.editing_started) self.cur_val = None self.path = None - self.event_id = None + self.release_event_id = 0 + self.press_event_id = 0 + self.focus_id = 0 self.teaching = False self.treeview = treeview @@ -880,9 +882,11 @@ None, Gdk.CURRENT_TIME) editable.set_text(_("Pick an accelerator")) + self.accel_editable = editable - self.event_id = self.treeview.connect( "key-release-event", self.on_key_release ) - self.focus_id = editable.connect( "focus-out-event", self.on_focus_out ) + self.release_event_id = self.accel_editable.connect( "key-release-event", self.on_key_release ) + self.press_event_id = self.accel_editable.connect( "key-press-event", self.on_key_press ) + self.focus_id = self.accel_editable.connect( "focus-out-event", self.on_focus_out ) self.teaching = True else: self.ungrab() @@ -892,6 +896,12 @@ def on_focus_out(self, widget, event): self.ungrab() + def on_key_press(self, widget, event): + if self.teaching: + return True + + return False + def on_key_release(self, widget, event): self.ungrab() if ((int(event.state) & 0xff & ~IGNORED_MOD_MASK) == 0) and event.keyval == Gdk.KEY_Escape: @@ -922,9 +932,12 @@ def ungrab(self): self.keyboard.ungrab(Gdk.CURRENT_TIME) - if self.event_id: - self.treeview.disconnect(self.event_id) - self.event_id = None - if self.focus_id: - self.treeview.disconnect(self.focus_id) - self.focus_id = None + if self.release_event_id > 0: + self.accel_editable.disconnect(self.release_event_id) + self.release_event_id = 0 + if self.press_event_id > 0: + self.accel_editable.disconnect(self.press_event_id) + self.press_event_id = 0 + if self.focus_id > 0: + self.accel_editable.disconnect(self.focus_id) + self.focus_id = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/misc/screenSaver.js new/Cinnamon-2.8.7/js/misc/screenSaver.js --- old/Cinnamon-2.8.6/js/misc/screenSaver.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/misc/screenSaver.js 2016-03-07 18:22:23.000000000 +0100 @@ -5,11 +5,13 @@ const ScreenSaverIface = '<node> \ - <interface name="org.gnome.ScreenSaver"> \ + <interface name="org.cinnamon.ScreenSaver"> \ <method name="GetActive"> \ <arg type="b" direction="out" /> \ </method> \ - <method name="Lock" /> \ + <method name="Lock"> \ + <arg type="s" direction="in" /> \ + </method> \ <method name="SetActive"> \ <arg type="b" direction="in" /> \ </method> \ @@ -25,8 +27,8 @@ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session, g_interface_name: ScreenSaverInfo.name, g_interface_info: ScreenSaverInfo, - g_name: 'org.gnome.ScreenSaver', - g_object_path: '/org/gnome/ScreenSaver', + g_name: 'org.cinnamon.ScreenSaver', + g_object_path: '/org/cinnamon/ScreenSaver', g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); self.init(null); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/misc/signalManager.js new/Cinnamon-2.8.7/js/misc/signalManager.js --- old/Cinnamon-2.8.6/js/misc/signalManager.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/misc/signalManager.js 2016-03-07 18:22:23.000000000 +0100 @@ -145,7 +145,7 @@ * Returns: Whether the signal is connected */ isConnected: function() { - return (this.getSignals(arguments).length > 0); + return (this.getSignals.apply(this, arguments).length > 0); }, /** @@ -192,10 +192,10 @@ * checks need not be performed before calling this function. */ disconnect: function() { - let results = this.getSignals(arguments); + let results = this.getSignals.apply(this, arguments); results.filter(this._signalIsConnected).forEach(x => x[1].disconnect(x[3])); - this._storage = this._storage.filter(x => results.indexOf(x) != -1); + this._storage = this._storage.filter(x => results.indexOf(x) == -1); }, /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/misc/util.js new/Cinnamon-2.8.7/js/misc/util.js --- old/Cinnamon-2.8.6/js/misc/util.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/misc/util.js 2016-03-07 18:22:23.000000000 +0100 @@ -113,25 +113,10 @@ */ function trySpawn(argv) { - try { - let [success, pid] = GLib.spawn_async(null, argv, null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.STDOUT_TO_DEV_NULL | GLib.SpawnFlags.STDERR_TO_DEV_NULL, - null, null); - return pid; - } catch (err) { - if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) { - err.message = _("Command not found"); - } else { - // The exception from gjs contains an error string like: - // Error invoking GLib.spawn_command_line_async: Failed to - // execute child process "foo" (No such file or directory) - // We are only interested in the part in the parentheses. (And - // we can't pattern match the text, since it gets localized.) - err.message = err.message.replace(/.*\((.+)\)/, '$1'); - } - - throw err; - } + let [success, pid] = GLib.spawn_async(null, argv, null, + GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.STDOUT_TO_DEV_NULL | GLib.SpawnFlags.STDERR_TO_DEV_NULL, + null, null); + return pid; } /** @@ -144,15 +129,8 @@ function trySpawnCommandLine(command_line) { let pid; - try { - let [success, argv] = GLib.shell_parse_argv(command_line); - pid = trySpawn(argv); - } catch (err) { - // Replace "Error invoking GLib.shell_parse_argv: " with - // something nicer - err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n"); - throw err; - } + let [success, argv] = GLib.shell_parse_argv(command_line); + pid = trySpawn(argv); return pid; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/ui/cinnamonDBus.js new/Cinnamon-2.8.7/js/ui/cinnamonDBus.js --- old/Cinnamon-2.8.6/js/ui/cinnamonDBus.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/ui/cinnamonDBus.js 2016-03-07 18:22:23.000000000 +0100 @@ -12,6 +12,7 @@ const ExtensionSystem = imports.ui.extensionSystem; const SearchProviderManager = imports.ui.searchProviderManager; const Util = imports.misc.util; +const Cinnamon = imports.gi.Cinnamon; const CinnamonIface = '<node> \ @@ -102,11 +103,11 @@ </interface> \ </node>'; -function Cinnamon() { +function CinnamonDBus() { this._init(); } -Cinnamon.prototype = { +CinnamonDBus.prototype = { _init: function() { this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this); this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon'); @@ -142,14 +143,11 @@ return [success, returnValue]; }, - _onScreenshotComplete: function(obj, result, area, flash, invocation) { + _onScreenshotComplete: function(obj, result, area, flash) { if (flash) { let flashspot = new Flashspot.Flashspot(area); flashspot.fire(); } - - let retval = GLib.Variant.new('(b)', [result]); - invocation.return_value(retval); }, /** @@ -167,12 +165,10 @@ * indicating whether the operation was successful or not. * */ - ScreenshotAreaAsync : function (params, invocation) { - let [include_cursor, x, y, width, height, flash, filename, callback] = params; + ScreenshotArea: function (include_cursor, x, y, width, height, flash, filename) { let screenshot = new Cinnamon.Screenshot(); - screenshot.screenshot_area (include_cursor, x, y, width, height, filename, - Lang.bind(this, this._onScreenshotComplete, - flash, invocation)); + screenshot.screenshot_area (include_cursor, x, y, width, 200, filename, + Lang.bind(this, this._onScreenshotComplete, flash)); }, /** @@ -187,8 +183,7 @@ * indicating whether the operation was successful or not. * */ - ScreenshotWindowAsync : function (params, invocation) { - let [include_frame, include_cursor, flash, filename] = params; + ScreenshotWindow: function (include_frame, include_cursor, flash, filename) { let screenshot = new Cinnamon.Screenshot(); screenshot.screenshot_window (include_frame, include_cursor, filename, Lang.bind(this, this._onScreenshotComplete, @@ -206,8 +201,7 @@ * indicating whether the operation was successful or not. * */ - ScreenshotAsync : function (params, invocation) { - let [include_cursor, flash, filename] = params; + Screenshot: function (include_cursor, flash, filename) { let screenshot = new Cinnamon.Screenshot(); screenshot.screenshot(include_cursor, filename, Lang.bind(this, this._onScreenshotComplete, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/ui/layout.js new/Cinnamon-2.8.7/js/ui/layout.js --- old/Cinnamon-2.8.6/js/ui/layout.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/ui/layout.js 2016-03-07 18:22:23.000000000 +0100 @@ -384,7 +384,7 @@ this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) { if (!err) - this._onScreenSaverActiveChanged(this._screenSaverProxy, result); + this._onScreenSaverActiveChanged(this._screenSaverProxy, null, result); })); this._relayout(); @@ -519,8 +519,9 @@ if (!actorData.isToplevel) continue; - if (this._screenSaverActive) + if (this._screenSaverActive) { visible = false; + } else if (this._inOverview) visible = true; else if (!actorData.visibleInFullscreen && @@ -552,8 +553,8 @@ this._queueUpdateRegions(); }, - _onScreenSaverActiveChanged: function(proxy, screenSaverActive) { - this._screenSaverActive = screenSaverActive; + _onScreenSaverActiveChanged: function(proxy, connection, screenSaverActive) { + this._screenSaverActive = screenSaverActive[0]; this._updateVisibility(); this._queueUpdateRegions(); }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/ui/magnifier.js new/Cinnamon-2.8.7/js/ui/magnifier.js --- old/Cinnamon-2.8.6/js/ui/magnifier.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/ui/magnifier.js 2016-03-07 18:22:23.000000000 +0100 @@ -1476,6 +1476,7 @@ }; const INCR = 0.1; +const MAX_ZOOM = 15.0; /* from range of org.cinnamon.desktop.a11y.magnifier mag-factor key */ function MagnifierInputHandler(magnifier) { this._init(magnifier); @@ -1539,9 +1540,9 @@ _zoom_in: function(display, screen, event, kb, action) { if (this.zoom_active) { - this.current_zoom *= (1.0 + INCR); + this.current_zoom = Math.min(this.current_zoom * (1.0 + INCR), MAX_ZOOM); } else { - this.current_zoom *= (1.0 + INCR); + this.current_zoom *= Math.min(this.current_zoom * (1.0 + INCR), MAX_ZOOM); this.magnifier.setActive(true) this.zoom_active = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.6/js/ui/main.js new/Cinnamon-2.8.7/js/ui/main.js --- old/Cinnamon-2.8.6/js/ui/main.js 2015-11-26 21:35:36.000000000 +0100 +++ new/Cinnamon-2.8.7/js/ui/main.js 2016-03-07 18:22:23.000000000 +0100 @@ -291,7 +291,7 @@ Gio.DesktopAppInfo.set_desktop_env('X-Cinnamon'); - cinnamonDBusService = new CinnamonDBus.Cinnamon(); + cinnamonDBusService = new CinnamonDBus.CinnamonDBus(); // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will // also initialize CinnamonAppSystem first. CinnamonAppSystem ++++++ cinnamon-favourite-applications.patch ++++++ --- /var/tmp/diff_new_pack.tY3RXS/_old 2016-03-16 10:35:14.000000000 +0100 +++ /var/tmp/diff_new_pack.tY3RXS/_new 2016-03-16 10:35:14.000000000 +0100 @@ -1,6 +1,6 @@ --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -366,7 +366,7 @@ +@@ -367,7 +367,7 @@ </key> <key name="favorite-apps" type="as"> ++++++ cinnamon-fix-backgrounds-lookup.patch ++++++ --- /var/tmp/diff_new_pack.tY3RXS/_old 2016-03-16 10:35:14.000000000 +0100 +++ /var/tmp/diff_new_pack.tY3RXS/_new 2016-03-16 10:35:14.000000000 +0100 @@ -1,6 +1,6 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py +++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py -@@ -671,6 +671,8 @@ class ThreadedIconView(Gtk.IconView): +@@ -673,6 +673,8 @@ class ThreadedIconView(Gtk.IconView): if backgroundNode.tag == "static": for staticNode in backgroundNode: if staticNode.tag == "file":
