Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2017-11-21 15:35:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Tue Nov 21 15:35:08 2017 rev:23 rq:544087 version:3.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2017-11-19 11:13:29.906777427 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2017-11-21 15:35:15.214945070 +0100 @@ -1,0 +2,16 @@ +Tue Nov 21 07:11:21 UTC 2017 - [email protected] + +- Update to version 3.6.5 (changes since 3.6.3): + * calendar applet: Just listen to the gsetting key for 24h to + make sure the vertical panel default clock obeys global + date/time settings. + * st-theme.c: st_theme_resolve_url could assert with a theme + issue. + * cinnamon-settings: Use icon buttons in the xlet management + pages. + * Fixes crash if device.get_icon_name() is Null. + * Allow showing seconds on a vertical panel. + * cs_sound.py: Replace tabs with spaces. + * calendar applet: Fix formatting. + +------------------------------------------------------------------- Old: ---- Cinnamon-3.6.3.tar.gz New: ---- Cinnamon-3.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.3vRrxm/_old 2017-11-21 15:35:17.706854770 +0100 +++ /var/tmp/diff_new_pack.3vRrxm/_new 2017-11-21 15:35:17.706854770 +0100 @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 3.6.0 Name: cinnamon -Version: 3.6.3 +Version: 3.6.5 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ AND LGPL-2.1 ++++++ Cinnamon-3.6.3.tar.gz -> Cinnamon-3.6.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.3/configure.ac new/Cinnamon-3.6.5/configure.ac --- old/Cinnamon-3.6.3/configure.ac 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/configure.ac 2017-11-20 16:15:59.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[3.6.3],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[3.6.5],[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.3/debian/changelog new/Cinnamon-3.6.5/debian/changelog --- old/Cinnamon-3.6.3/debian/changelog 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/debian/changelog 2017-11-20 16:15:59.000000000 +0100 @@ -1,3 +1,33 @@ +cinnamon (3.6.5) sylvia; urgency=medium + + [ Michael Webster ] + * cs_sound.py: Replace tab with space. + * calendar applet: Fix formatting. + + -- Clement Lefebvre <[email protected]> Mon, 20 Nov 2017 15:15:07 +0000 + +cinnamon (3.6.4) sylvia; urgency=medium + + [ Michael Webster ] + * calendar applet: Just listen to the gsetting key for 24h to make sure the vertical panel default clock obeys global date/time settings. + + [ Simon Brown ] + * st-theme.c: st_theme_resolve_url could assert with a theme issue (#7046) + + [ brownsr ] + * st-theme: ensure callers of st_theme_resolve_url cater for it returning null knock-on from previous commit + + [ JosephMcc ] + * cinnamon-settings: Use icon buttons in the xlet management pages + + [ François Lachèse ] + * Fixes crash if device.get_icon_name() is Null (#7054) + + [ Corbin Auriti ] + * Allow showing seconds on vertical panel (#7038) + + -- Clement Lefebvre <[email protected]> Mon, 20 Nov 2017 10:05:39 +0000 + cinnamon (3.6.3) sylvia; urgency=medium [ Clement Lefebvre ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js new/Cinnamon-3.6.5/files/usr/share/cinnamon/applets/[email protected]/applet.js --- old/Cinnamon-3.6.3/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/files/usr/share/cinnamon/applets/[email protected]/applet.js 2017-11-20 16:15:59.000000000 +0100 @@ -73,6 +73,17 @@ this.settings.bind("use-custom-format", "use_custom_format", this._onSettingsChanged); this.settings.bind("custom-format", "custom_format", this._onSettingsChanged); + /* FIXME: Add gobject properties to the WallClock class to allow easier access from + * its clients, and possibly a separate signal to notify of updates to these properties + * (though GObject "changed" would be sufficient.) */ + this.desktop_settings = new Gio.Settings({ schema_id: "org.cinnamon.desktop.interface" }); + this.desktop_settings.connect("changed::clock-use-24h", Lang.bind(this, function(key) { + this._onSettingsChanged(); + })); + this.desktop_settings.connect("changed::clock-show-seconds", Lang.bind(this, function(key) { + this._onSettingsChanged(); + })); + this.clock = new CinnamonDesktop.WallClock(); this.clock_notify_id = 0; @@ -117,13 +128,25 @@ 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("FORMAT ERROR %l:%M %p"); + this.clock.set_format_string("~CLOCK FORMAT ERROR~ %l:%M %p"); } } else if (in_vertical_panel) { - /* 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); + let use_24h = this.desktop_settings.get_boolean("clock-use-24h"); + let show_seconds = this.desktop_settings.get_boolean("clock-show-seconds"); + + if (use_24h) { + if (show_seconds) { + this.clock.set_format_string("%H%n%M%n%S"); + } else { + this.clock.set_format_string("%H%n%M%"); + } + } else { + if (show_seconds) { + this.clock.set_format_string("%l%n%M%n%S"); + } else { + this.clock.set_format_string("%l%n%M%"); + } + } } else { this.clock.set_format_string(null); } @@ -131,17 +154,10 @@ _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 && !in_vertical_panel) { + if (!this.use_custom_format) { 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.3/files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py new/Cinnamon-3.6.5/files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py --- old/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py 2017-11-20 16:15:59.000000000 +0100 @@ -447,37 +447,41 @@ button_holder.set_expand(True) button_toolbar.add(button_holder) box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) - button_group = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL) box.set_halign(Gtk.Align.CENTER) button_holder.add(box) # buttons - self.instance_button = Gtk.Button(label=self.instance_button_text) + self.instance_button = Gtk.Button.new_from_icon_name("list-add-symbolic", Gtk.IconSize.MENU) + self.instance_button.set_size_request(50, -1) + self.instance_button.set_tooltip_text(self.instance_button_text) self.instance_button.connect('clicked', self.add_instance) - button_group.add_widget(self.instance_button) box.add(self.instance_button) self.instance_button.set_sensitive(False) - self.remove_button = Gtk.Button(label=self.remove_button_text) + self.remove_button = Gtk.Button.new_from_icon_name("list-remove-symbolic", Gtk.IconSize.MENU) + self.remove_button.set_size_request(50, -1) + self.remove_button.set_tooltip_text(self.remove_button_text) self.remove_button.connect('clicked', self.remove_all_instances) - button_group.add_widget(self.remove_button) box.add(self.remove_button) self.remove_button.set_sensitive(False) - self.uninstall_button = Gtk.Button(label=self.uninstall_button_text) + self.uninstall_button = Gtk.Button.new_from_icon_name("edit-delete-symbolic", Gtk.IconSize.MENU) + self.uninstall_button.set_size_request(50, -1) + self.uninstall_button.set_tooltip_text(self.uninstall_button_text) self.uninstall_button.connect('clicked', self.uninstall_extension) - button_group.add_widget(self.uninstall_button) box.add(self.uninstall_button) self.uninstall_button.set_sensitive(False) - self.restore_button = Gtk.Button(label=self.restore_button_text) + self.restore_button = Gtk.Button.new_from_icon_name("edit-undo-symbolic", Gtk.IconSize.MENU) + self.restore_button.set_size_request(50, -1) + self.restore_button.set_tooltip_text(self.restore_button_text) self.restore_button.connect('clicked', self.restore_to_default) - button_group.add_widget(self.restore_button) box.add(self.restore_button) - self.about_button = Gtk.Button(label=_("About")) + self.about_button = Gtk.Button.new_from_icon_name("help-about-symbolic", Gtk.IconSize.MENU) + self.about_button.set_size_request(50, -1) + self.about_button.set_tooltip_text(_("About")) self.about_button.connect('clicked', self.about) - button_group.add_widget(self.about_button) box.add(self.about_button) self.about_button.set_sensitive(False) @@ -810,32 +814,35 @@ button_holder.set_expand(True) button_toolbar.add(button_holder) box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) - button_group = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL) box.set_halign(Gtk.Align.CENTER) button_holder.add(box) # buttons - self.more_info_button = Gtk.Button(label=_("More info")) + self.more_info_button = Gtk.Button.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU) + self.more_info_button.set_size_request(50, -1) + self.more_info_button.set_tooltip_text(_("More info")) self.more_info_button.connect('clicked', self.get_more_info) - button_group.add_widget(self.more_info_button) box.add(self.more_info_button) self.more_info_button.set_sensitive(False) - self.uninstall_button = Gtk.Button(label=_("Uninstall")) + self.uninstall_button = Gtk.Button.new_from_icon_name("edit-delete-symbolic", Gtk.IconSize.MENU) + self.uninstall_button.set_size_request(50, -1) + self.uninstall_button.set_tooltip_text(_("Uninstall")) self.uninstall_button.connect('clicked', self.uninstall) - button_group.add_widget(self.uninstall_button) box.add(self.uninstall_button) self.uninstall_button.set_sensitive(False) - self.update_all_button = Gtk.Button(label=_("Update all")) + self.update_all_button = Gtk.Button.new_from_icon_name("software-update-available-symbolic", Gtk.IconSize.MENU) + self.update_all_button.set_size_request(50, -1) + self.update_all_button.set_tooltip_text(_("Update all")) self.update_all_button.connect('clicked', self.update_all) - button_group.add_widget(self.update_all_button) box.add(self.update_all_button) self.update_all_button.set_sensitive(False) - self.refresh_button = Gtk.Button(label=_("Refresh")) + self.refresh_button = Gtk.Button.new_from_icon_name("emblem-synchronizing-symbolic", Gtk.IconSize.MENU) + self.refresh_button.set_size_request(50, -1) + self.refresh_button.set_tooltip_text(_("Refresh")) self.refresh_button.connect('clicked', self.refresh) - button_group.add_widget(self.refresh_button) box.add(self.refresh_button) # progress bar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py new/Cinnamon-3.6.5/files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py --- old/Cinnamon-3.6.3/files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/files/usr/share/cinnamon/cinnamon-settings/modules/cs_sound.py 2017-11-20 16:15:59.000000000 +0100 @@ -677,6 +677,7 @@ iconTheme = Gtk.IconTheme.get_default() gicon = device.get_gicon() + iconName = device.get_icon_name() icon = None if gicon is not None: lookup = iconTheme.lookup_by_gicon(gicon, 32, 0) @@ -684,7 +685,7 @@ icon = lookup.load_icon() if icon is None: - if ("bluetooth" in device.get_icon_name()): + if (iconName is not None and "bluetooth" in iconName): icon = iconTheme.load_icon("bluetooth", 32, 0) else: icon = iconTheme.load_icon("audio-card", 32, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.3/src/st/st-theme-node.c new/Cinnamon-3.6.5/src/st/st-theme-node.c --- old/Cinnamon-3.6.3/src/st/st-theme-node.c 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/src/st/st-theme-node.c 2017-11-20 16:15:59.000000000 +0100 @@ -113,7 +113,7 @@ { g_object_unref (node->border_image); node->border_image = NULL; - } + } if (node->icon_colors) { @@ -1873,9 +1873,11 @@ file = _st_theme_resolve_url (node->theme, base_stylesheet, term->content.str->stryng->str); - - node->background_image = g_file_get_path (file); - g_object_unref (file); + if (file) + { + node->background_image = g_file_get_path (file); + g_object_unref (file); + } } } } @@ -1984,8 +1986,11 @@ base_stylesheet, decl->value->content.str->stryng->str); - node->background_image = g_file_get_path (file); - g_object_unref (file); + if (file) + { + node->background_image = g_file_get_path (file); + g_object_unref (file); + } } else if (term_is_inherit (decl->value)) { @@ -2017,8 +2022,11 @@ file = _st_theme_resolve_url (node->theme, base_stylesheet, decl->value->content.str->stryng->str); - node->background_bumpmap = g_file_get_path (file); - g_object_unref (file); + if (file) + { + node->background_bumpmap = g_file_get_path (file); + g_object_unref (file); + } } else if (term_is_inherit (decl->value)) { @@ -2952,8 +2960,11 @@ base_stylesheet = NULL; file = _st_theme_resolve_url (node->theme, base_stylesheet, url); - filename = g_file_get_path (file); - g_object_unref (file); + if (file) + { + filename = g_file_get_path (file); + g_object_unref (file); + } if (filename == NULL) goto next_property; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-3.6.3/src/st/st-theme.c new/Cinnamon-3.6.5/src/st/st-theme.c --- old/Cinnamon-3.6.3/src/st/st-theme.c 2017-11-17 11:48:58.000000000 +0100 +++ new/Cinnamon-3.6.5/src/st/st-theme.c 2017-11-20 16:15:59.000000000 +0100 @@ -185,7 +185,7 @@ G_SIGNAL_RUN_LAST, 0, /* no default handler slot */ NULL, NULL, NULL, - G_TYPE_NONE, 0); + G_TYPE_NONE, 0); } static CRStyleSheet * @@ -904,9 +904,11 @@ file = _st_theme_resolve_url (a_this, a_nodesheet, import_rule->url->stryng->str); - filename = g_file_get_path (file); - - g_object_unref (file); + if (file) + { + filename = g_file_get_path (file); + g_object_unref (file); + } } if (filename) @@ -1104,12 +1106,14 @@ base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet); - /* This is an internal function, if we get here with - a bad @base_stylesheet we have a problem. */ - g_assert (base_filename); + if (base_filename == NULL) + { + g_warning ("Can't get base to resolve url '%s'", url); + return NULL; + } - dirname = g_path_get_dirname (base_filename); - stylesheet = g_file_new_for_path (dirname); + dirname = g_path_get_dirname (base_filename); /* returns . if empty */ + stylesheet = g_file_new_for_path (dirname); /* always returns something */ resource = g_file_resolve_relative_path (stylesheet, url); g_object_unref (stylesheet);
