Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2017-08-22 11:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Tue Aug 22 11:11:11 2017 rev:20 rq:518014 version:3.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2017-07-12 19:36:53.884787646 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2017-08-22 11:11:12.427039277 +0200 @@ -1,0 +2,35 @@ +Sun Aug 20 16:09:40 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 3.4.6 (changes since 3.4.4): + * osdWindow.js: Always check the theme node on first showing - an + actor's width isn't necessarily filled if it hasn't been + explicitly set, causing the first few activations of the OSD to not show an accurate level bar. + * cs_default: Fix an incorrect button label (but preserve + translations). + * main.js: Remove an obsolete Meta enum member reference. + * workspace.js: Use our normal prototype init method. + * workspace.js: Initalise WindowClone._zoomStep to 0. + * slideshow-applet: Fix a translation. + * cs_themes.py: Create the file "~/.icons/default/index.theme" and + set the selected cursor theme inside of it. This ensures other + (non-gtk) applications end up using the same theme (though they + are required to be restarted for these changes to take effect). + * keyboard-applet: Applet icon vanishes when moved in edit mode. + * cinnamon-json-makepot: Add keyword option, change language used + by xgettext to JavaScript. + * expoThumbnail: Correct a couple of calls with mismatched + argument counts. + * window-list: Set AppMenuButtons unreactive during panel edit + mode. + * panel-launchers: Set PanelAppLaunchers unreactive during panel + edit mode. + * windows-quick-list: Fix argument warning. + * Fix a reference to undefined actor._delegate warning. + * ui/environment: Handle undefined actors in + containerClass.prototype.add. + * ui/cinnamonDBus: Handle null xlet objects in + CinnamonDBus.highlightXlet. + * deskletManager: Initialise some variables and remove the + variables that were initialised, probable typo + +------------------------------------------------------------------- Old: ---- Cinnamon-3.4.4.tar.gz New: ---- Cinnamon-3.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.yVSbKT/_old 2017-08-22 11:11:13.302915948 +0200 +++ /var/tmp/diff_new_pack.yVSbKT/_new 2017-08-22 11:11:13.314914259 +0200 @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 3.4.0 Name: cinnamon -Version: 3.4.4 +Version: 3.4.6 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ AND LGPL-2.1 ++++++ Cinnamon-3.4.4.tar.gz -> Cinnamon-3.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/configure.ac new/Cinnamon-3.4.6/configure.ac --- old/Cinnamon-3.4.4/configure.ac 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/configure.ac 2017-08-09 12:47:15.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[3.4.4],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[3.4.6],[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-3.4.4/debian/changelog new/Cinnamon-3.4.6/debian/changelog --- old/Cinnamon-3.4.4/debian/changelog 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/debian/changelog 2017-08-09 12:47:15.000000000 +0200 @@ -1,3 +1,53 @@ +cinnamon (3.4.6) sonya; urgency=medium + + * Remove strict dependency on libcjs-dbg + + -- Clement Lefebvre <r...@linuxmint.com> Wed, 09 Aug 2017 12:46:49 +0200 + +cinnamon (3.4.5) sonya; urgency=medium + + [ Michael Webster ] + * osdWindow.js: Always check the theme node on first showing - an actor's width isn't necessarily filled if it hasn't been explicitly set, causing the first few activations of the OSD to not show an accurate level bar. + * cs_default: Fix incorrect button label (but preserve translations). + + [ itzexor ] + * main.js: remove obsolete Meta enum member reference + * workspace.js: use our normal prototype init method + * workspace.js: initalize WindowClone._zoomStep to 0 + + [ NikoKrause ] + * slideshow-applet: fix translation + + [ Michael Webster ] + * cs_themes.py: Create the file "~/.icons/default/index.theme" and set the selected cursor theme inside of it. This ensures other (non-gtk) applications end up using the same theme (though they are required to be restarted for these changes to take effect.) + + [ NikoKrause ] + * keyboard-applet: applet icon vanishes when moved in edit mode + + [ Jason Hicks ] + * cinnamon-json-makepot: Add keyword option, change language used by xgettext to JavaScript + + [ brownsr ] + * expoThumbnail: correct a couple of calls with mismatched argument counts + + [ itzexor ] + * window-list: set AppMenuButtons unreactive during panel edit mode + * panel-launchers: set PanelAppLaunchers unreactive during panel edit mode + * windows-quick-list: fix argument warning + + [ Jason Hicks ] + * Fix reference to undefined actor._delegate warning + * ui/environment: Handle undefined actors in containerClass.prototype.add + * ui/cinnamonDBus: Handle null xlet objects in CinnamonDBus.highlightXlet + + [ brownsr ] + * deskletManager: initialise some variables and remove the variables that were initialised, probable typo + + [ Michael Webster ] + * debian/control: Add libcjs-dbg to cinnamon-dbg depends. + + -- Clement Lefebvre <r...@linuxmint.com> Tue, 08 Aug 2017 12:44:02 +0200 + cinnamon (3.4.4) sonya; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/debian/control new/Cinnamon-3.4.6/debian/control --- old/Cinnamon-3.4.4/debian/control 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/debian/control 2017-08-09 12:47:15.000000000 +0200 @@ -121,6 +121,7 @@ libcvc-dbg, libcinnamon-desktop-dbg, libcinnamon-menu-3-0-dbg, + libcjs-dbg | libcjs0e, cinnamon-control-center-dbg Description: Debugging symbols for the Cinnamon desktop Cinnamon is a modern Linux desktop which provides advanced innovative diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/keybo...@cinnamon.org/applet.js new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/keybo...@cinnamon.org/applet.js --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/keybo...@cinnamon.org/applet.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/keybo...@cinnamon.org/applet.js 2017-08-09 12:47:15.000000000 +0200 @@ -190,7 +190,12 @@ on_applet_added_to_panel: function() { this._config = new XApp.KbdLayoutController(); - this._syncConfig(); + if (global.settings.get_boolean(PANEL_EDIT_MODE_KEY)) { + this._syncConfig(); + this._onPanelEditModeChanged(); + } else { + this._syncConfig(); + } this._config.connect('layout-changed', Lang.bind(this, this._syncGroup)); this._config.connect('config-changed', Lang.bind(this, this._syncConfig)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/applet.js new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/applet.js --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/applet.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/applet.js 2017-08-09 12:47:15.000000000 +0200 @@ -168,7 +168,7 @@ this._draggable.connect('drag-cancelled', Lang.bind(this, this._onDragCancelled)); this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd)); - this._draggable.inhibit = !this.launchersBox.allowDragging || global.settings.get_boolean(PANEL_EDIT_MODE_KEY); + this._updateInhibit(); this.launchersBox.connect("launcher-draggable-setting-changed", Lang.bind(this, this._updateInhibit)); global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._updateInhibit)); }, @@ -191,7 +191,9 @@ }, _updateInhibit: function(){ - this._draggable.inhibit = !this.launchersBox.allowDragging || global.settings.get_boolean(PANEL_EDIT_MODE_KEY); + let editMode = global.settings.get_boolean(PANEL_EDIT_MODE_KEY); + this._draggable.inhibit = !this.launchersBox.allowDragging || editMode; + this.actor.reactive = !editMode; }, getDragActor: function() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/slides...@cinnamon.org/applet.js new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/slides...@cinnamon.org/applet.js --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/slides...@cinnamon.org/applet.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/slides...@cinnamon.org/applet.js 2017-08-09 12:47:15.000000000 +0200 @@ -5,8 +5,6 @@ const Applet = imports.ui.applet; const PopupMenu = imports.ui.popupMenu; const Util = imports.misc.util; -const Gettext = imports.gettext.domain("cinnamon-applets"); -const _ = Gettext.gettext; function MyApplet(metadata, orientation, panel_height, instanceId) { this._init(metadata, orientation, panel_height, instanceId); @@ -62,7 +60,7 @@ catch(e) { global.logError(e); } - + }, on_applet_clicked: function(event) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/window-l...@cinnamon.org/applet.js new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/window-l...@cinnamon.org/applet.js --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/window-l...@cinnamon.org/applet.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/window-l...@cinnamon.org/applet.js 2017-08-09 12:47:15.000000000 +0200 @@ -341,8 +341,10 @@ }, onPanelEditModeChanged: function() { + let editMode = global.settings.get_boolean("panel-edit-mode"); if (this._draggable) - this._draggable.inhibit = global.settings.get_boolean("panel-edit-mode"); + this._draggable.inhibit = editMode; + this.actor.reactive = !editMode; }, onScrollModeChanged: function() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/windows-quick-l...@cinnamon.org/applet.js new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/windows-quick-l...@cinnamon.org/applet.js --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/applets/windows-quick-l...@cinnamon.org/applet.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/applets/windows-quick-l...@cinnamon.org/applet.js 2017-08-09 12:47:15.000000000 +0200 @@ -114,7 +114,7 @@ activateWindow: function(metaWorkspace, metaWindow) { this.menu.toggle(); if(!metaWindow.is_on_all_workspaces()) { metaWorkspace.activate(global.get_current_time()); } - metaWindow.unminimize(global.get_current_time()); + metaWindow.unminimize(); metaWindow.activate(global.get_current_time()); }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py 2017-08-09 12:47:15.000000000 +0200 @@ -50,7 +50,7 @@ usage = """ Usage: - cinnamon-json-makepot -i | -r | [-js] <potfile name> + cinnamon-json-makepot -i | -r | -k | [-js] <potfile name> -js, --js - Runs xgettext on any javascript files in your directory before scanning the settings-schema.json file. This allows you to generate @@ -69,6 +69,9 @@ -r, --remove - The opposite of install, removes translations from the store. Again, it uses the UUID to find the correct files to remove + -k, --keyword - Change the variable name gettext is assigned to in your + javascript files. The default is _. + <potfile name> - name of the .pot file to work with. This can be pre-existing, or the name of a new file to use. If you leave off the .pot extension, it will be automatically appended to the file name. @@ -97,6 +100,7 @@ parser.add_option("-j", "--js", action="store_true", dest="js", default=False) parser.add_option("-i", "--install", action="store_true", dest="install", default=False) parser.add_option("-r", "--remove", action="store_true", dest="remove", default=False) + parser.add_option("-k", "--keyword", type="str", dest="keyword", default="_") (options, args) = parser.parse_args() @@ -132,7 +136,11 @@ try: os.system('find . -iname "*.js" > %s' % tmp.name) finally: - os.system("xgettext --language=C --keyword=_ --output=%s --files-from=%s" % (self.potname, tmp.name)) + os.system("xgettext --language=JavaScript --keyword=%s --output=%s --files-from=%s" % ( + options.keyword, + self.potname, + tmp.name + )) self.current_parent_dir = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py 2017-08-09 12:47:15.000000000 +0200 @@ -353,9 +353,10 @@ self.setPreference(pref_open_folder, PREF_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER) class OtherTypeDialog(Gtk.Dialog): - def __init__(self, media_settings): + def __init__(self, media_settings, transient_parent): super(OtherTypeDialog, self).__init__(title = _("Other Media"), - transient_for = None, + transient_for = transient_parent, + border_width = 6, flags = 0) self.add_button(_("Close"), Gtk.ResponseType.OK) @@ -472,7 +473,7 @@ print "Loading Default module" self.media_settings = Gio.Settings.new(MEDIA_HANDLING_SCHEMA) - self.other_type_dialog = OtherTypeDialog(self.media_settings) + self.other_type_dialog = OtherTypeDialog(self.media_settings, self.sidePage.window) self.sidePage.stack = SettingsStack() self.sidePage.add_widget(self.sidePage.stack) @@ -531,12 +532,16 @@ widget.pack_end(button, False, False, 0) settings.add_row(widget) - button = Button(_("_Other Media..."), self.onMoreClicked) + # FIXMEEEEEEEE?? + button = Button(_("_Other Media...").strip("_"), self.onMoreClicked) settings.add_row(button) def onMoreClicked(self, widget): self.other_type_dialog.doShow(widget.get_toplevel()) + def _setParentRef(self, window): + self.sidePage.window = window + class InvertedSwitch(SettingsWidget): def __init__(self, label, schema, key): self.key = key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py --- old/Cinnamon-3.4.4/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2017-08-09 12:47:15.000000000 +0200 @@ -258,6 +258,8 @@ self.cursor_chooser.set_tooltip_text(theme) except Exception, detail: print detail + + self.update_cursor_theme_link(path, theme) return True def _on_cinnamon_theme_selected(self, path, theme): @@ -366,3 +368,20 @@ res.remove(j) res.append((i[0], i[1])) return res + + def update_cursor_theme_link(self, path, name): + default_dir = os.path.join(os.path.expanduser("~"), ".icons", "default") + index_path = os.path.join(default_dir, "index.theme") + + try: + os.makedirs(default_dir) + except os.error as e: + pass + + if os.path.exists(index_path): + os.unlink(index_path) + + contents = "[icon theme]\nInherits=%s\n" % name + + with open(index_path, "w") as f: + f.write(contents) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/cinnamonDBus.js new/Cinnamon-3.4.6/js/ui/cinnamonDBus.js --- old/Cinnamon-3.4.4/js/ui/cinnamonDBus.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/cinnamonDBus.js 2017-08-09 12:47:15.000000000 +0200 @@ -307,7 +307,7 @@ highlightXlet: function(uuid, instance_id, highlight) { let obj = this._getXletObject(uuid, instance_id); - if (obj.highlight) obj.highlight(highlight); + if (obj && obj.highlight) obj.highlight(highlight); }, highlightPanel: function(id, highlight) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/deskletManager.js new/Cinnamon-3.4.6/js/ui/deskletManager.js --- old/Cinnamon-3.4.4/js/ui/deskletManager.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/deskletManager.js 2017-08-09 12:47:15.000000000 +0200 @@ -375,8 +375,8 @@ this.actor = new Clutter.Group(); this.actor._delegate = this; - this.lastX = 0; - this.lastY = 0; + this.last_x = -1; + this.last_y = -1; this._dragPlaceholder = new St.Bin({style_class: 'desklet-drag-placeholder'}); this._dragPlaceholder.hide(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/environment.js new/Cinnamon-3.4.6/js/ui/environment.js --- old/Cinnamon-3.4.4/js/ui/environment.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/environment.js 2017-08-09 12:47:15.000000000 +0200 @@ -34,6 +34,9 @@ // method. We conveniently, but somewhat dubiously, take the // this opportunity to make it do something more useful. containerClass.prototype.add = function(actor, props) { + if (actor === undefined) { + return false; + } this.add_actor(actor); if (props) this.child_set(actor, props); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/expoThumbnail.js new/Cinnamon-3.4.6/js/ui/expoThumbnail.js --- old/Cinnamon-3.4.4/js/ui/expoThumbnail.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/expoThumbnail.js 2017-08-09 12:47:15.000000000 +0200 @@ -466,9 +466,8 @@ // Use the stable sequence for an integer to use as a hash key this.stackIndices[stack[i].get_meta_window().get_stable_sequence()] = i; } + this.syncStacking(this.stackIndices); } - - this.syncStacking(this.stackIndices); }, setActive: function(isActive) { @@ -961,7 +960,7 @@ if (dropping) { metaWindow.move_to_monitor(targetMonitor); if (targetMonitor === Main.layoutManager.primaryIndex) { - metaWindow.change_workspace(this.metaWorkspace, false, time); + metaWindow.change_workspace(this.metaWorkspace); } } } @@ -975,7 +974,7 @@ { canDrop = true; if (dropping) { - metaWindow.change_workspace(this.metaWorkspace, false, time); + metaWindow.change_workspace(this.metaWorkspace); } } if (movingMonitors) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/main.js new/Cinnamon-3.4.6/js/ui/main.js --- old/Cinnamon-3.4.4/js/ui/main.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/main.js 2017-08-09 12:47:15.000000000 +0200 @@ -1226,7 +1226,6 @@ expo.hide(); return true; case Meta.KeyBindingAction.PANEL_RUN_DIALOG: - case Meta.KeyBindingAction.COMMAND_2: getRunDialog().open(); return true; case Meta.KeyBindingAction.PANEL_MAIN_MENU: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/osdWindow.js new/Cinnamon-3.4.6/js/ui/osdWindow.js --- old/Cinnamon-3.4.4/js/ui/osdWindow.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/osdWindow.js 2017-08-09 12:47:15.000000000 +0200 @@ -37,6 +37,8 @@ _init: function() { this._level = 0; + this.initial = true; + this.actor = new St.Bin({ style_class: 'level', x_align: St.Align.START, y_fill: true, @@ -61,7 +63,9 @@ * or the theme changed. Make sure we update it, as well as figure out our * level bar's allocation. */ - if (this.stored_actor_width != this.actor.width) { + if (this.initial || (this.stored_actor_width != this.actor.width)) { + this.initial = false; + this.stored_actor_width = this.actor.width; let box = this.actor.get_theme_node().get_content_box(this.actor.get_allocation_box()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/popupMenu.js new/Cinnamon-3.4.6/js/ui/popupMenu.js --- old/Cinnamon-3.4.4/js/ui/popupMenu.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/popupMenu.js 2017-08-09 12:47:15.000000000 +0200 @@ -2021,10 +2021,11 @@ }, _getMenuItems: function() { - return this.box.get_children().map(function (actor) { + return this.box.get_children().filter(function(actor) { + return (actor._delegate !== undefined + && (actor._delegate instanceof PopupBaseMenuItem || actor._delegate instanceof PopupMenuSection)); + }).map(function (actor) { return actor._delegate; - }).filter(function(item) { - return item instanceof PopupBaseMenuItem || item instanceof PopupMenuSection; }); }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.4.4/js/ui/workspace.js new/Cinnamon-3.4.6/js/ui/workspace.js --- old/Cinnamon-3.4.4/js/ui/workspace.js 2017-07-06 11:18:17.000000000 +0200 +++ new/Cinnamon-3.4.6/js/ui/workspace.js 2017-08-09 12:47:15.000000000 +0200 @@ -62,10 +62,16 @@ function ScaledPoint(x, y, scaleX, scaleY) { - [this.x, this.y, this.scaleX, this.scaleY] = arguments; + this._init(x, y, scaleX, scaleY); } ScaledPoint.prototype = { + _init: function(x, y, scaleX, scaleY) { + this.x = x; + this.y = y; + this.scaleX = scaleX; + this.scaleY = scaleY; + }, getPosition : function() { return [this.x, this.y]; }, @@ -75,11 +81,13 @@ }, setPosition : function(x, y) { - [this.x, this.y] = arguments; + this.x = x; + this.y = y; }, setScale : function(scaleX, scaleY) { - [this.scaleX, this.scaleY] = arguments; + this.scaleX = scaleX; + this.scaleY = scaleY; }, interpPosition : function(other, step) { @@ -170,6 +178,7 @@ this._windowIsZooming = false; this._zooming = false; + this._zoomStep = 0; this._selected = false; }, @@ -260,7 +269,7 @@ scrollZoom: function (direction) { if (direction === Clutter.ScrollDirection.UP) { - if (this._zoomStep == undefined) + if (this._zoomStep == 0) this._zoomStart(); if (this._zoomStep < 100) { this._zoomStep += SCROLL_SCALE_AMOUNT; @@ -360,7 +369,7 @@ this._zoomGlobalPosition = undefined; this._zoomGlobalScale = undefined; this._zoomTargetPosition = undefined; - this._zoomStep = undefined; + this._zoomStep = 0; }, _onButtonPress: function(actor, event) {
