Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2019-07-22 12:21:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Mon Jul 22 12:21:06 2019 rev:30 rq:717340 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2019-07-18 15:19:06.428158124 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new.4126/nemo.changes 2019-07-22 12:21:07.847652711 +0200 @@ -1,0 +2,22 @@ +Sun Jul 21 06:55:55 UTC 2019 - Marguerite Su <i...@marguerite.su> + +- Update to version 4.2.1: + * Fix nemo_global_preferences_get_size_prefix_preference + getting set to the wrong value + * nemo-view.c: Always show the pin/unpin actions. + * various: Fix a couple leaks + * nemo-list-model.c: When the last child of a node is + removed, Handle re-adding a dummy row (or not) in the + file removed handler, instead of always adding one, + then removing it on parent's subsequent changed call. + * nemo-list-view.c: When triggering a rename using the + 'slow double click' trigger, check whether the file + is a folder to determine whether to select all or + only non-extension text. + * nemo-view.c: Use the stack for running the action + visiblity cycle. + * nemo-*-view.c: Update the selection info when a view + has finished loading. + * Toolbar: Don't show thumbnail button by default + +------------------------------------------------------------------- Old: ---- nemo-4.2.0.tar.gz New: ---- nemo-4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.c0nGry/_old 2019-07-22 12:21:08.755652473 +0200 +++ /var/tmp/diff_new_pack.c0nGry/_new 2019-07-22 12:21:08.759652472 +0200 @@ -1,7 +1,7 @@ # # spec file for package nemo # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0-or-later @@ -29,12 +29,12 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE nemo-gtk-3.20.patch -- Restore GTK+ 3.20 support. Patch0: nemo-gtk-3.20.patch +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: meson -BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: python3-gobject BuildRequires: shared-mime-info ++++++ nemo-4.2.0.tar.gz -> nemo-4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/data/nemo-actions/action_i18n_strings.py new/nemo-4.2.1/data/nemo-actions/action_i18n_strings.py --- old/nemo-4.2.0/data/nemo-actions/action_i18n_strings.py 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/data/nemo-actions/action_i18n_strings.py 2019-07-10 12:10:46.000000000 +0200 @@ -2,7 +2,7 @@ ''' This is a dummy file for translating Nemo Action files - It was generated by the extract_action_strings script on 2019-06-23 15:17:45.018171 UTC. + It was generated by the extract_action_strings script on 2019-06-29 16:00:22.705098 UTC. ''' set-as-background_nemo_action_in_Name = _("Set as Wallpaper...") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/debian/changelog new/nemo-4.2.1/debian/changelog --- old/nemo-4.2.0/debian/changelog 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/debian/changelog 2019-07-10 12:10:46.000000000 +0200 @@ -1,3 +1,26 @@ +nemo (4.2.1) tina; urgency=medium + + [ Clement Lefebvre ] + * l10n: Fix msgid + * l10n: Fix msgids + + [ gm10 ] + * Fix nemo_global_preferences_get_size_prefix_preference getting set to the wrong value (#2165) + + [ Michael Webster ] + * nemo-file-operations.c: Add comment for unused singular translation, make the string obviously unused. + * nemo-view.c: Always show the pin/unpin actions. + * various: Fix a couple leaks + * nemo-list-model.c: When the last child of a node is removed, Handle re-adding a dummy row (or not) in the file removed handler, instead of always adding one, then removing it on parent's subsequent changed call. + * nemo-list-view.c: When triggering a rename using the 'slow double click' trigger, check whether the file is a folder to determine whether to select all or only non-extension text. + * nemo-view.c: Use the stack for running the action visiblity cycle. + * nemo-*-view.c: Update the selection info when a view has finished loading. + + [ Clement Lefebvre ] + * Toolbar: Don't show thumbnail button by default + + -- Clement Lefebvre <r...@linuxmint.com> Wed, 10 Jul 2019 12:10:27 +0200 + nemo (4.2.0) tina; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/gresources/nemo-desktop-overlay.glade new/nemo-4.2.1/gresources/nemo-desktop-overlay.glade --- old/nemo-4.2.0/gresources/nemo-desktop-overlay.glade 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/gresources/nemo-desktop-overlay.glade 2019-07-10 12:10:46.000000000 +0200 @@ -194,8 +194,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes"><b>Icon Size</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Icon Size</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">True</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/gresources/nemo-desktop-preferences.glade new/nemo-4.2.1/gresources/nemo-desktop-preferences.glade --- old/nemo-4.2.0/gresources/nemo-desktop-preferences.glade 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/gresources/nemo-desktop-preferences.glade 2019-07-10 12:10:46.000000000 +0200 @@ -33,8 +33,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes"><b>Desktop Layout</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Desktop Layout</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">True</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/libnemo-private/nemo-desktop-directory-file.c new/nemo-4.2.1/libnemo-private/nemo-desktop-directory-file.c --- old/nemo-4.2.0/libnemo-private/nemo-desktop-directory-file.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/libnemo-private/nemo-desktop-directory-file.c 2019-07-10 12:10:46.000000000 +0200 @@ -217,6 +217,7 @@ desktop_callback_check_done (DesktopCallback *desktop_callback) { NemoFile *file; + gchar *name; /* Check if we are ready. */ if (desktop_callback->initializing || @@ -227,8 +228,11 @@ /* Ensure our metadata is updated before calling back */ file = NEMO_FILE (desktop_callback->desktop_file); - nemo_desktop_update_metadata_from_keyfile (file, get_indexed_key (file)); + name = get_indexed_key (file); + nemo_desktop_update_metadata_from_keyfile (file, name); + + g_free (name); /* Remove from the hash table before sending it. */ g_hash_table_remove (desktop_callback->desktop_file->details->callbacks, desktop_callback); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/libnemo-private/nemo-file-operations.c new/nemo-4.2.1/libnemo-private/nemo-file-operations.c --- old/nemo-4.2.0/libnemo-private/nemo-file-operations.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/libnemo-private/nemo-file-operations.c 2019-07-10 12:10:46.000000000 +0200 @@ -1522,8 +1522,8 @@ prompt = f (_("Are you sure you want to move \"%B\" " "to the trash?"), files->data); } else { - prompt = f (ngettext("Are you sure you want to move " - "the %'d selected items to the trash?", + /* translators: the singular form here can be skipped. */ + prompt = f (ngettext("unused %'d", "Are you sure you want to move " "the %'d selected items to the trash?", file_count), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/libnemo-private/nemo-global-preferences.c new/nemo-4.2.1/libnemo-private/nemo-global-preferences.c --- old/nemo-4.2.0/libnemo-private/nemo-global-preferences.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/libnemo-private/nemo-global-preferences.c 2019-07-10 12:10:46.000000000 +0200 @@ -91,7 +91,7 @@ int nemo_global_preferences_get_size_prefix_preference (void) { - return inherit_show_thumbnails_preference; + return size_prefixes_preference; } char * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/libnemo-private/org.nemo.gschema.xml new/nemo-4.2.1/libnemo-private/org.nemo.gschema.xml --- old/nemo-4.2.0/libnemo-private/org.nemo.gschema.xml 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/libnemo-private/org.nemo.gschema.xml 2019-07-10 12:10:46.000000000 +0200 @@ -161,7 +161,7 @@ <description>If set to true, then Nemo browser windows will show the button.</description> </key> <key type="b" name="show-show-thumbnails-toolbar"> - <default>true</default> + <default>false</default> <summary>Show Thumbnails button in nemo toolbar</summary> <description>If set to true, then Nemo browser windows will show the button.</description> </key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/meson.build new/nemo-4.2.1/meson.build --- old/nemo-4.2.0/meson.build 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/meson.build 2019-07-10 12:10:46.000000000 +0200 @@ -1,7 +1,7 @@ # Meson build file # https://github.com/linuxmint/nemo -project('nemo', 'c', version: '4.2.0', +project('nemo', 'c', version: '4.2.1', meson_version: '>=0.41.0' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/nemo.pot new/nemo-4.2.1/nemo.pot --- old/nemo-4.2.0/nemo.pot 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/nemo.pot 2019-07-10 12:10:46.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-23 17:17+0200\n" +"POT-Creation-Date: 2019-06-29 18:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -240,12 +240,12 @@ msgstr "" #: src/nemo-desktop-icon-grid-view.c:1027 -#: gresources/nemo-desktop-overlay.glade:291 +#: gresources/nemo-desktop-overlay.glade:293 msgid "Auto-arrange" msgstr "" #: src/nemo-desktop-icon-grid-view.c:1032 -#: gresources/nemo-desktop-overlay.glade:537 +#: gresources/nemo-desktop-overlay.glade:539 msgid "Reverse sort" msgstr "" @@ -1139,7 +1139,7 @@ #: libnemo-private/nemo-bookmark.c:130 libnemo-private/nemo-desktop-link.c:118 #: libnemo-private/nemo-file-utilities.c:67 #: libnemo-private/nemo-file-utilities.c:116 generate_additional_file:41 -#: gresources/nemo-desktop-preferences.glade:209 +#: gresources/nemo-desktop-preferences.glade:211 #: gresources/nemo-file-management-properties.glade:2925 msgid "Home" msgstr "" @@ -1169,7 +1169,7 @@ #: src/nemo-places-sidebar.c:863 src/nemo-trash-bar.c:211 #: libnemo-private/nemo-desktop-link.c:135 generate_additional_file:55 -#: gresources/nemo-desktop-preferences.glade:287 +#: gresources/nemo-desktop-preferences.glade:289 msgid "Trash" msgstr "" @@ -1207,7 +1207,7 @@ #: src/nemo-places-sidebar.c:1135 src/nemo-places-sidebar.c:1190 #: src/nemo-tree-sidebar.c:1559 libnemo-private/nemo-desktop-link.c:147 -#: gresources/nemo-desktop-preferences.glade:443 +#: gresources/nemo-desktop-preferences.glade:445 msgid "Network" msgstr "" @@ -1800,7 +1800,7 @@ msgstr "" #: src/nemo-tree-sidebar.c:1546 libnemo-private/nemo-desktop-link.c:126 -#: generate_additional_file:48 gresources/nemo-desktop-preferences.glade:131 +#: generate_additional_file:48 gresources/nemo-desktop-preferences.glade:133 #: gresources/nemo-file-management-properties.glade:2888 msgid "Computer" msgstr "" @@ -5196,84 +5196,84 @@ msgstr "" #: gresources/nemo-desktop-overlay.glade:197 -msgid "<b>Icon Size</b>" +msgid "Icon Size" msgstr "" -#: gresources/nemo-desktop-overlay.glade:238 +#: gresources/nemo-desktop-overlay.glade:240 msgid "Layout" msgstr "" -#: gresources/nemo-desktop-overlay.glade:367 +#: gresources/nemo-desktop-overlay.glade:369 msgid "Direction" msgstr "" -#: gresources/nemo-desktop-overlay.glade:452 +#: gresources/nemo-desktop-overlay.glade:454 msgid "Sort items by" msgstr "" -#: gresources/nemo-desktop-overlay.glade:611 +#: gresources/nemo-desktop-overlay.glade:613 msgid "Reset grid spacing" msgstr "" -#: gresources/nemo-desktop-overlay.glade:678 -#: gresources/nemo-desktop-overlay.glade:868 +#: gresources/nemo-desktop-overlay.glade:680 +#: gresources/nemo-desktop-overlay.glade:870 msgid "button" msgstr "" -#: gresources/nemo-desktop-overlay.glade:744 +#: gresources/nemo-desktop-overlay.glade:746 msgid "Adjust horizontal grid spacing" msgstr "" -#: gresources/nemo-desktop-overlay.glade:799 +#: gresources/nemo-desktop-overlay.glade:801 msgid "Adjust vertical grid spacing" msgstr "" -#: gresources/nemo-desktop-overlay.glade:843 +#: gresources/nemo-desktop-overlay.glade:845 msgid "page0" msgstr "" -#: gresources/nemo-desktop-overlay.glade:857 +#: gresources/nemo-desktop-overlay.glade:859 msgid "" "<b><big>Desktop icons are not currently enabled for this monitor.</big></b>" msgstr "" -#: gresources/nemo-desktop-overlay.glade:885 +#: gresources/nemo-desktop-overlay.glade:887 msgid "page1" msgstr "" #: gresources/nemo-desktop-preferences.glade:36 -msgid "<b>Desktop Layout</b>" +msgid "Desktop Layout" msgstr "" -#: gresources/nemo-desktop-preferences.glade:52 +#: gresources/nemo-desktop-preferences.glade:54 msgid "No desktop icons" msgstr "" -#: gresources/nemo-desktop-preferences.glade:53 +#: gresources/nemo-desktop-preferences.glade:55 msgid "Show desktop icons on primary monitor only" msgstr "" -#: gresources/nemo-desktop-preferences.glade:54 +#: gresources/nemo-desktop-preferences.glade:56 msgid "Show desktop icons on non-primary monitor(s) only" msgstr "" -#: gresources/nemo-desktop-preferences.glade:55 +#: gresources/nemo-desktop-preferences.glade:57 msgid "Show desktop icons on all monitors" msgstr "" -#: gresources/nemo-desktop-preferences.glade:75 +#: gresources/nemo-desktop-preferences.glade:77 msgid "Desktop Icons" msgstr "" -#: gresources/nemo-desktop-preferences.glade:365 +#: gresources/nemo-desktop-preferences.glade:367 msgid "Mounted Drives" msgstr "" -#: gresources/nemo-desktop-preferences.glade:501 +#: gresources/nemo-desktop-preferences.glade:503 msgid "Options" msgstr "" -#: gresources/nemo-desktop-preferences.glade:557 +#: gresources/nemo-desktop-preferences.glade:559 msgid "Show icons from missing monitors" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-desktop-application.c new/nemo-4.2.1/src/nemo-desktop-application.c --- old/nemo-4.2.0/src/nemo-desktop-application.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-desktop-application.c 2019-07-10 12:10:46.000000000 +0200 @@ -328,6 +328,9 @@ g_application_open (application, files, len, ""); + g_object_unref (files[0]); + g_free (files); + out: g_option_context_free (context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-icon-view-grid-container.c new/nemo-4.2.1/src/nemo-icon-view-grid-container.c --- old/nemo-4.2.0/src/nemo-icon-view-grid-container.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-icon-view-grid-container.c 2019-07-10 12:10:46.000000000 +0200 @@ -1414,13 +1414,12 @@ pango_font_description_free (desc); - pango_layout_set_width (layout, floor (GET_VIEW_CONSTANT (container, max_text_width_standard)) * PANGO_SCALE); - pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); - pango_layout_get_pixel_size (layout, NULL, &height); + g_object_unref (layout); + height *= ellipsis_limit; height += icon_size + GET_VIEW_CONSTANT (container, icon_pad_bottom) + LABEL_OFFSET; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-icon-view.c new/nemo-4.2.1/src/nemo-icon-view.c --- old/nemo-4.2.0/src/nemo-icon-view.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-icon-view.c 2019-07-10 12:10:46.000000000 +0200 @@ -1086,6 +1086,8 @@ icon_container = GTK_WIDGET (get_icon_container (icon_view)); nemo_icon_container_end_loading (NEMO_ICON_CONTAINER (icon_container), all_files_seen); + nemo_icon_container_update_selection (NEMO_ICON_CONTAINER (icon_container)); + monitor = nemo_clipboard_monitor_get (); info = nemo_clipboard_monitor_get_clipboard_info (monitor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-list-model.c new/nemo-4.2.1/src/nemo-list-model.c --- old/nemo-4.2.0/src/nemo-list-model.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-list-model.c 2019-07-10 12:10:46.000000000 +0200 @@ -1225,8 +1225,16 @@ /* We need to do this before removing the last file to avoid * collapsing the row. */ - add_dummy_row (model, parent_file_entry); - } + + guint count; + gboolean got_count, unreadable; + + got_count = nemo_file_get_directory_item_count (parent_file_entry->file, &count, &unreadable); + + if ((!got_count && !unreadable) || count > 0) { + add_dummy_row (model, parent_file_entry); + } + } if (file_entry->subdirectory != NULL) { g_signal_emit (model, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-list-view.c new/nemo-4.2.1/src/nemo-list-view.c --- old/nemo-4.2.0/src/nemo-list-view.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-list-view.c 2019-07-10 12:10:46.000000000 +0200 @@ -422,7 +422,9 @@ if (view->details->rename_on_release) { NemoFile *file = nemo_list_model_file_for_path (view->details->model, path); - nemo_list_view_start_renaming_file (NEMO_VIEW (view), file, FALSE); + nemo_list_view_start_renaming_file (NEMO_VIEW (view), + file, + nemo_file_is_directory (file)); nemo_file_unref (file); view->details->rename_on_release = FALSE; } @@ -3863,6 +3865,8 @@ NemoClipboardMonitor *monitor; NemoClipboardInfo *info; + nemo_list_view_update_selection (view); + monitor = nemo_clipboard_monitor_get (); info = nemo_clipboard_monitor_get_clipboard_info (monitor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-4.2.0/src/nemo-view.c new/nemo-4.2.1/src/nemo-view.c --- old/nemo-4.2.0/src/nemo-view.c 2019-06-23 17:21:06.000000000 +0200 +++ new/nemo-4.2.1/src/nemo-view.c 2019-07-10 12:10:46.000000000 +0200 @@ -6402,16 +6402,13 @@ update_actions_visibility (NemoView *view, GList *selection) { GList *actions = gtk_action_group_list_actions (view->details->actions_action_group); - ActionVisibilityData *data; + ActionVisibilityData data; - data = g_slice_new0 (ActionVisibilityData); + data.view = view; + data.selection = selection; - data->view = view; - data->selection = selection; + g_list_foreach (actions, determine_visibility, &data); - g_list_foreach (actions, determine_visibility, data); - - g_slice_free (ActionVisibilityData, data); g_list_free (actions); } @@ -9616,8 +9613,6 @@ const gchar *complex_item_paths[] = { "/selection/File Clipboard Actions/Duplicate", - "/selection/File Actions/Pin File", - "/selection/File Actions/Unpin File", "/selection/File Actions/Create Link", "/selection/File Actions/CopyToMenu", "/selection/File Actions/MoveToMenu",
