Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2017-11-19 11:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Sun Nov 19 11:13:21 2017 rev:22 rq:542733 version:3.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2017-11-14 12:57:09.575085779 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2017-11-19 11:13:29.906777427 +0100 @@ -1,0 +2,33 @@ +Sat Nov 18 00:00:12 UTC 2017 - [email protected] + +- Update to version 3.6.3: + * Show-desktop: Disable peek-at-desktop by default. + * menu applet: Recalculate applications list box height when the + menu's allocation changes. + * Applets: When setting an icon, make sure it's actually an + St.Icon. Some applets (such as the keyboard applet) set + _applet_icon to something other than an St.Icon, so it causes + an error when trying to set the icon using one of the api + functions. This was causing the keyboard applet not to show in + the panel edit mode after a keyboard layout was added and + removed. + * applet settings: Fix panel switch buttons not being hidden when + there is only one panel. + * Add Adwaita-dark thumbnails. + * extension settings: Scan the system directory for extensions. + * Initialise applet position to avoid drag and drop errors in + edit mode occasionally the null applet position was being + carried through to the writing of the new applet causing + apparent drop failures, and to the disappearance of the + highlighted drop box. Much visible weirdness with a very simple + solution. + * workspace switcher: Fix an undeclared variable warning. + * applet settings: Improve the logic for highlighting the panel. + The panel is now only highlighted when there is more than one + panel, and it's better about selecting and highlighting the + correct panel when one is added or removed. + * Fixed spacing. Add a missing semicolon. + * popupMenu: Prevent a warning of this._triangle. + * Clock applet: Respect a 12h/24h choice in the vertical mode. + +------------------------------------------------------------------- Old: ---- Cinnamon-3.6.2.tar.gz New: ---- Cinnamon-3.6.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.U2pug4/_old 2017-11-19 11:13:31.130732801 +0100 +++ /var/tmp/diff_new_pack.U2pug4/_new 2017-11-19 11:13:31.130732801 +0100 @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 3.6.0 Name: cinnamon -Version: 3.6.2 +Version: 3.6.3 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ AND LGPL-2.1 ++++++ Cinnamon-3.6.2.tar.gz -> Cinnamon-3.6.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/configure.ac new/Cinnamon-3.6.3/configure.ac --- old/Cinnamon-3.6.2/configure.ac 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/configure.ac 2017-11-17 11:48:58.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[3.6.2],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[3.6.3],[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.6.2/debian/changelog new/Cinnamon-3.6.3/debian/changelog --- old/Cinnamon-3.6.2/debian/changelog 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/debian/changelog 2017-11-17 11:48:58.000000000 +0100 @@ -1,3 +1,39 @@ +cinnamon (3.6.3) sylvia; urgency=medium + + [ Clement Lefebvre ] + * Show-desktop: Disable peek-at-desktop by default + + [ Michael Webster ] + * menu applet: recalculate applications list box height when the menu's allocation changes. + + [ Stephen Collins ] + * Applets: when setting an icon, make sure it's actually an St.Icon. Some applets (such as the keyboard applet) set _applet_icon to something other than an St.Icon, so it causes an error when trying to set the icon using one of the api functions. This was causing the keyboard applet not to show in panel edit mode after a keyboard layout was added and removed. (#7008) + * applet settings: fix panel switch buttons not being hidden when there is only one panel (#7023) + + [ Bernhard Landauer ] + * add Adwaita-dark thumbnails (#7015) + + [ Stephen Collins ] + * extesion settings: scan system folder for extensions. While we don't ship with any extensions, other distros may choose to do so + + [ brownsr ] + * initialise applet position to avoid drag and drop errors in edit mode occasionally the null applet position was being carried through to the writing of the new applet causing apparent drop failures, and to the disappearance of the highlighted drop box. Much visible weirdness with a very simple solution + + [ Stephen Collins ] + * workspace switcher: fix undeclared variable warning + * applet settings: Improve the logic for highlighting the panel. The panel is now only highlighted when there is more than one panel, and it's better about selecting and highlighting the correct panel when one is added or removed + + [ icarter09 ] + * Fixed spacing. Added missing semicolon. (#7032) + + [ Jason Hicks ] + * popupMenu: Prevent warning of this._triangle (#7033) + + [ Corbin Auriti ] + * Clock applet: Respect 12h/24h choice in vertical mode (#7034) + + -- Clement Lefebvre <[email protected]> Fri, 17 Nov 2017 10:48:22 +0000 + cinnamon (3.6.2) sylvia; urgency=medium [ Simon Brown ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-17 11:48:58.000000000 +0100 @@ -117,10 +117,13 @@ if (this.use_custom_format) { if (!this.clock.set_format_string(this.custom_format)) { global.logError("Calendar applet: bad time format string - check your string."); - this.clock.set_format_string("~CLOCK FORMAT ERROR~ %l:%M %p"); + this.clock.set_format_string("FORMAT ERROR %l:%M %p"); } } else if (in_vertical_panel) { - this.clock.set_format_string("%H%n%M"); + /* First removes the date, then changes single splits 24hr mode, then removes "AM/PM" in 12hr mode, finaly replacing : with a newline */ + let current_format = this.clock.get_default_time_format(); + let vertical_format = current_format.replace('%A %B %e, ', '').replace('%R', '%H%n%M').replace(' %p', '').replace(new RegExp(":", 'g'), "%n"); + this.clock.set_format_string(vertical_format); } else { this.clock.set_format_string(null); } @@ -128,10 +131,17 @@ _updateClockAndDate: function() { let label_string = this.clock.get_clock(); + let in_vertical_panel = (this.orientation == St.Side.LEFT || this.orientation == St.Side.RIGHT); - if (!this.use_custom_format) { + if (!this.use_custom_format && !in_vertical_panel) { label_string = label_string.capitalize(); } + else { + let vertical_format = this.clock.get_default_time_format(); + /* First removes the date, then changes single splits 24hr mode, then removes "AM/PM" in 12hr mode, finaly replacing : with a newline */ + vertical_format = vertical_format.replace('%A %B %e, ', '').replace('%R', '%H%n%M').replace(' %p', '').replace(new RegExp(":", 'g'), "%n"); + label_string = this.clock.get_clock_for_format(vertical_format); + } this.set_applet_label(label_string); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-17 11:48:58.000000000 +0100 @@ -1282,7 +1282,6 @@ // The reason we do is in case the Cinnamon icon theme is the same as the one specificed in GTK itself (in .config) // In that particular case we get no signal at all. this._refreshAll(); - this._recalc_height(); this.set_show_label_in_vertical_panels(false); }, @@ -1307,6 +1306,8 @@ this._refreshFavs(); this._refreshPlaces(); this._refreshRecent(); + + this._resizeApplicationsBox(); } catch (exception) { global.log(exception); @@ -1317,6 +1318,8 @@ _refreshBelowApps: function() { this._refreshPlaces(); this._refreshRecent(); + + this._resizeApplicationsBox(); }, openMenu: function() { @@ -2256,7 +2259,6 @@ this._setCategoriesButtonActive(!this.searchActive); - this._recalc_height(); this._resizeApplicationsBox(); }, @@ -2479,7 +2481,6 @@ this._setCategoriesButtonActive(!this.searchActive); - this._recalc_height(); this._resizeApplicationsBox(); }, @@ -2731,8 +2732,6 @@ }); this.favoritesBox.add(button.actor, { y_align: St.Align.END, y_fill: false }); - - this._recalc_height(); }, _loadCategory: function(dir, top_dir) { @@ -2924,6 +2923,8 @@ Mainloop.idle_add(Lang.bind(this, function() { this._clearAllSelections(true); })); + + this.menu.actor.connect("allocation-changed", Lang.bind(this, this._on_allocation_changed)); }, _updateVFade: function() { @@ -2940,6 +2941,10 @@ this.applicationsScrollBox.set_auto_scrolling(this.autoscroll_enabled); }, + _on_allocation_changed: function(box, flags, data) { + this._recalc_height(); + }, + _clearAllSelections: function(hide_apps) { let actors = this.applicationsBox.get_children(); for (let i = 0; i < actors.length; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json 2017-11-17 11:48:58.000000000 +0100 @@ -5,7 +5,7 @@ }, "peek-at-desktop" : { "type" : "switch", - "default" : true, + "default" : false, "description": "Peek at the desktop on hover", "tooltip": "Peek at the desktop when hovering the applet" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-17 11:48:58.000000000 +0100 @@ -236,6 +236,10 @@ this.actor.add_actor (this.manager_container); this.manager_container.show(); + this._focusWindow = 0; + if (global.display.focus_window) + this._focusWindow = global.display.focus_window.get_compositor_private(); + this.settings = new Settings.AppletSettings(this, metadata.uuid, instance_id); this.settings.bind("display_type", "display_type", this._createButtons); @@ -266,10 +270,6 @@ })); this._applet_context_menu.addMenuItem(this.removeWorkspaceMenuItem); this.removeWorkspaceMenuItem.setSensitive(global.screen.n_workspaces > 1); - - this._focusWindow = 0; - if (global.display.focus_window) - this._focusWindow = global.display.focus_window.get_compositor_private(); } catch (e) { global.logError(e); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_applets.py new/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_applets.py --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_applets.py 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_applets.py 2017-11-17 11:48:58.000000000 +0100 @@ -68,14 +68,12 @@ self.panel_select_buttons = Gtk.Box() self.panel_select_buttons.get_style_context().add_class("linked") - # self.previous_button = Gtk.Button.new_from_icon_name('go-previous-symbolic', Gtk.IconSize.BUTTON) self.previous_button = Gtk.Button(label=_("Previous Panel")) - self.previous_button.set_no_show_all(False) + self.previous_button.set_no_show_all(True) self.previous_button.connect("clicked", self.previous_panel) self.panel_select_buttons.add(self.previous_button) - # self.next_button = Gtk.Button.new_from_icon_name('go-next-symbolic', Gtk.IconSize.BUTTON) self.next_button = Gtk.Button(label=_("Next Panel")) - self.next_button.set_no_show_all(False) + self.next_button.set_no_show_all(True) self.next_button.connect("clicked", self.next_panel) self.panel_select_buttons.add(self.next_button) size_group = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL) @@ -87,7 +85,7 @@ self.connect("map", self.restore_highlight) self.connect("unmap", self.remove_highlight) self.connect("destroy", self.remove_highlight) - self.spices.settings.connect('changed:: panels-enabled', self.panels_changed) + self.spices.settings.connect('changed::panels-enabled', self.panels_changed) self.panels_changed() self.top_box.pack_start(self.panel_select_buttons, False, False, 0) @@ -119,25 +117,39 @@ n_mons = Gdk.Screen.get_default().get_n_monitors() # we only want to select panels that are on a connected screen + current_panel_exists = False for panel in self.spices.settings.get_strv('panels-enabled'): panel_id, monitor, pos = panel.split(":") if int(monitor) < n_mons: - if panel_id == self.panel_id: + if int(panel_id) == self.panel_id: self.current_panel_index = len(self.panels) + current_panel_exists = True self.panels.append(panel) + if not current_panel_exists: + # looks like the currently selected panel was removed. We'll just select the first one + self.current_panel_index = 0 + self.panel_id = int(self.panels[self.current_panel_index].split(":")[0]) + if len(self.panels) > 1: self.previous_button.show() self.next_button.show() + # just in case, we'll make sure the current panel is highlighted + self.restore_highlight() else: self.previous_button.hide() self.next_button.hide() + # there's no point in highlighting if there's only one panel + if current_panel_exists: + self.remove_highlight() def remove_highlight(self, *args): self.spices.send_proxy_signal('highlightPanel', '(ib)', self.panel_id, False) def restore_highlight(self, *args): - self.spices.send_proxy_signal('highlightPanel', '(ib)', self.panel_id, True) + # there's no point in highlighting if there's only one panel + if len(self.panels) > 1: + self.spices.send_proxy_signal('highlightPanel', '(ib)', self.panel_id, True) def enable(self, uuid): self.spices.enable_extension(uuid, panel=self.panel_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_extensions.py new/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_extensions.py --- old/Cinnamon-3.6.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_extensions.py 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_extensions.py 2017-11-17 11:48:58.000000000 +0100 @@ -47,7 +47,7 @@ self.stack.add_titled(download_extensions_page, "more", _("Download")) class ManageExtensionsPage(ManageSpicesPage): - directories = [("%s/.local/share/cinnamon/extensions") % GLib.get_home_dir()] + directories = ['/usr/share/cinnamon/extensions', ("%s/.local/share/cinnamon/extensions") % GLib.get_home_dir()] collection_type = "extension" installed_page_title = _("Installed extensions") instance_button_text = _("Enable") Binary files old/Cinnamon-3.6.2/files/usr/share/cinnamon/thumbnails/gtk-3.0/Adwaita-dark.png and new/Cinnamon-3.6.3/files/usr/share/cinnamon/thumbnails/gtk-3.0/Adwaita-dark.png differ Binary files old/Cinnamon-3.6.2/files/usr/share/cinnamon/thumbnails/metacity-1/Adwaita-dark.png and new/Cinnamon-3.6.3/files/usr/share/cinnamon/thumbnails/metacity-1/Adwaita-dark.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/js/ui/applet.js new/Cinnamon-3.6.3/js/ui/applet.js --- old/Cinnamon-3.6.2/js/ui/applet.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/js/ui/applet.js 2017-11-17 11:48:58.000000000 +0100 @@ -681,7 +681,7 @@ }, _ensureIcon: function() { - if (!this._applet_icon) + if (!this._applet_icon || !(this._applet_icon instanceof St.Icon)) this._applet_icon = new St.Icon({ reactive: true, track_hover: true, style_class: 'applet-icon'}); this._applet_icon_box.set_child(this._applet_icon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/js/ui/panel.js new/Cinnamon-3.6.3/js/ui/panel.js --- old/Cinnamon-3.6.2/js/ui/panel.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/js/ui/panel.js 2017-11-17 11:48:58.000000000 +0100 @@ -1763,7 +1763,7 @@ let children = this._panelZone.get_children(); let curAppletPos = 0; - let insertAppletPos = null; + let insertAppletPos = 0; for (let i = 0, len = children.length; i < len; i++) { if (children[i]._delegate instanceof Applet.Applet){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/js/ui/popupMenu.js new/Cinnamon-3.6.3/js/ui/popupMenu.js --- old/Cinnamon-3.6.2/js/ui/popupMenu.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/js/ui/popupMenu.js 2017-11-17 11:48:58.000000000 +0100 @@ -2863,9 +2863,9 @@ _init: function(text) { PopupBaseMenuItem.prototype._init.call(this); - // This check allows PopupSubMenu to be used as a generic scrollable container. PopupSubMenu - // already checks for the truthiness of this._triangle (passed as sourceArrow) before using - // it, so we can leave it undefined. + this._triangle = null; + + // This check allows PopupSubMenu to be used as a generic scrollable container. if (typeof text === 'string') { this.actor.add_style_class_name('popup-submenu-menu-item'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.2/js/ui/workspacesView.js new/Cinnamon-3.6.3/js/ui/workspacesView.js --- old/Cinnamon-3.6.2/js/ui/workspacesView.js 2017-11-11 18:20:15.000000000 +0100 +++ new/Cinnamon-3.6.3/js/ui/workspacesView.js 2017-11-17 11:48:58.000000000 +0100 @@ -254,7 +254,7 @@ _workspacesChanged: function() { let removedCount = 0; this._workspaces.slice().forEach(function(workspace, i) { - let metaWorkspace = global.screen.get_workspace_by_index(i-removedCount); + let metaWorkspace = global.screen.get_workspace_by_index(i - removedCount); if (workspace.metaWorkspace != metaWorkspace) { Tweener.removeTweens(workspace.actor); workspace.destroy(); @@ -266,7 +266,7 @@ while (global.screen.n_workspaces > this._workspaces.length) { let lastWs = global.screen.get_workspace_by_index(this._workspaces.length); let workspace = new Workspace.Workspace(lastWs, this); - this._workspaces.push(workspace) + this._workspaces.push(workspace); this.actor.add_actor(workspace.actor); } this._animating = false;
