Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2018-09-24 13:11:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Mon Sep 24 13:11:38 2018 rev:28 rq:636730 version:3.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2018-07-22 23:05:51.092894639 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2018-09-24 13:11:41.669872112 +0200 @@ -1,0 +2,11 @@ +Tue Sep 18 17:27:47 UTC 2018 - [email protected] + +- Update to version 3.8.6: + * nemo-icon-canvas-item.c: Insert some space between the icon and + label bounds in compact view. + * nemo-query-editor.c: Don't intercept keys when hidden. + * nemo-places-sidebar.c: Fix a few issues with mounting/ejecting: + some incorrect _finish functions and some assumptions of error + always being set. + +------------------------------------------------------------------- Old: ---- nemo-3.8.5.tar.gz New: ---- nemo-3.8.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.FJkH5K/_old 2018-09-24 13:11:42.157871248 +0200 +++ /var/tmp/diff_new_pack.FJkH5K/_new 2018-09-24 13:11:42.157871248 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.8.5 +Version: 3.8.6 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0-or-later ++++++ nemo-3.8.5.tar.gz -> nemo-3.8.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.5/debian/changelog new/nemo-3.8.6/debian/changelog --- old/nemo-3.8.5/debian/changelog 2018-07-17 09:44:05.000000000 +0200 +++ new/nemo-3.8.6/debian/changelog 2018-09-11 15:53:18.000000000 +0200 @@ -1,3 +1,12 @@ +nemo (3.8.6) tara; urgency=medium + + [ Michael Webster ] + * nemo-icon-canvas-item.c: Insert some space between the icon and label bounds in compact view. + * nemo-query-editor.c: don't intercept keys when hidden. + * nemo-places-sidebar.c: Fix a few issues with mounting/ejecting - some incorrect _finish functions and some assumptions of error always being set. + + -- Clement Lefebvre <[email protected]> Tue, 11 Sep 2018 14:52:55 +0100 + nemo (3.8.5) tara; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.5/libnemo-private/nemo-icon-canvas-item.c new/nemo-3.8.6/libnemo-private/nemo-icon-canvas-item.c --- old/nemo-3.8.5/libnemo-private/nemo-icon-canvas-item.c 2018-07-17 09:44:05.000000000 +0200 +++ new/nemo-3.8.6/libnemo-private/nemo-icon-canvas-item.c 2018-09-11 15:53:18.000000000 +0200 @@ -49,6 +49,7 @@ /* gap between bottom of icon and start of text box */ #define LABEL_OFFSET 1 +#define LABEL_OFFSET_BESIDES 3 #define LABEL_LINE_SPACING 0 /* special text height handling @@ -656,7 +657,7 @@ if (NEMO_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas)->details->label_position == NEMO_ICON_LABEL_POSITION_BESIDE) { if (!nemo_icon_container_is_layout_rtl (NEMO_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas))) { - text_rectangle.x0 = icon_rectangle.x1; + text_rectangle.x0 = icon_rectangle.x1 + LABEL_OFFSET_BESIDES; text_rectangle.x1 = text_rectangle.x0 + text_dx + text_width; } else { text_rectangle.x1 = icon_rectangle.x0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.5/meson.build new/nemo-3.8.6/meson.build --- old/nemo-3.8.5/meson.build 2018-07-17 09:44:05.000000000 +0200 +++ new/nemo-3.8.6/meson.build 2018-09-11 15:53:18.000000000 +0200 @@ -1,7 +1,7 @@ # Meson build file # https://github.com/linuxmint/nemo -project('nemo', 'c', version: '3.8.5', +project('nemo', 'c', version: '3.8.6', meson_version: '>=0.37.0' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.5/src/nemo-places-sidebar.c new/nemo-3.8.6/src/nemo-places-sidebar.c --- old/nemo-3.8.5/src/nemo-places-sidebar.c 2018-07-17 09:44:05.000000000 +0200 +++ new/nemo-3.8.6/src/nemo-places-sidebar.c 2018-09-11 15:53:18.000000000 +0200 @@ -2741,31 +2741,48 @@ } static void +handle_mount_unmount_failure (const gchar *primary, + GError *error) +{ + const gchar *message = NULL; + + if (error && error->code == G_IO_ERROR_FAILED_HANDLED) { + return; + } + + if (error) { + message = error->message; + } + + eel_show_error_dialog (primary, + message, + NULL); +} + +static void drive_eject_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { NemoWindow *window; GError *error; - char *primary; - char *name; window = user_data; g_object_unref (window); error = NULL; if (!g_drive_eject_with_operation_finish (G_DRIVE (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_drive_get_name (G_DRIVE (source_object)); - primary = g_strdup_printf (_("Unable to eject %s"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + char *name, *primary; + + name = g_drive_get_name (G_DRIVE (source_object)); + primary = g_strdup_printf (_("Unable to eject %s"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void @@ -2775,25 +2792,23 @@ { NemoWindow *window; GError *error; - char *primary; - char *name; window = user_data; g_object_unref (window); error = NULL; if (!g_volume_eject_with_operation_finish (G_VOLUME (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_volume_get_name (G_VOLUME (source_object)); - primary = g_strdup_printf (_("Unable to eject %s"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + char *name, *primary; + + name = g_volume_get_name (G_VOLUME (source_object)); + primary = g_strdup_printf (_("Unable to eject %s"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void @@ -2803,25 +2818,23 @@ { NemoWindow *window; GError *error; - char *primary; - char *name; window = user_data; g_object_unref (window); error = NULL; if (!g_mount_eject_with_operation_finish (G_MOUNT (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_mount_get_name (G_MOUNT (source_object)); - primary = g_strdup_printf (_("Unable to eject %s"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + char *name, *primary; + + name = g_mount_get_name (G_MOUNT (source_object)); + primary = g_strdup_printf (_("Unable to eject %s"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void @@ -2945,22 +2958,20 @@ gpointer user_data) { GError *error; - char *primary; - char *name; error = NULL; if (!g_drive_poll_for_media_finish (G_DRIVE (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_drive_get_name (G_DRIVE (source_object)); - primary = g_strdup_printf (_("Unable to poll %s for media changes"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + char *name, *primary; + + name = g_drive_get_name (G_DRIVE (source_object)); + primary = g_strdup_printf (_("Unable to poll %s for media changes"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void @@ -2990,22 +3001,21 @@ gpointer user_data) { GError *error; - char *primary; - char *name; error = NULL; - if (!g_drive_poll_for_media_finish (G_DRIVE (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_drive_get_name (G_DRIVE (source_object)); - primary = g_strdup_printf (_("Unable to start %s"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + + if (!g_drive_start_finish (G_DRIVE (source_object), res, &error)) { + char *name, *primary; + + name = g_drive_get_name (G_DRIVE (source_object)); + primary = g_strdup_printf (_("Unable to start %s"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void @@ -3042,25 +3052,24 @@ { NemoWindow *window; GError *error; - char *primary; - char *name; window = user_data; g_object_unref (window); error = NULL; - if (!g_drive_poll_for_media_finish (G_DRIVE (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - name = g_drive_get_name (G_DRIVE (source_object)); - primary = g_strdup_printf (_("Unable to stop %s"), name); - g_free (name); - eel_show_error_dialog (primary, - error->message, - NULL); - g_free (primary); - } - g_error_free (error); - } + + if (!g_drive_stop_finish (G_DRIVE (source_object), res, &error)) { + char *name, *primary; + + name = g_drive_get_name (G_DRIVE (source_object)); + primary = g_strdup_printf (_("Unable to stop %s"), name); + + handle_mount_unmount_failure (primary, error); + + g_free (name); + g_free (primary); + g_clear_error (&error); + } } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.8.5/src/nemo-query-editor.c new/nemo-3.8.6/src/nemo-query-editor.c --- old/nemo-3.8.5/src/nemo-query-editor.c 2018-07-17 09:44:05.000000000 +0200 +++ new/nemo-3.8.6/src/nemo-query-editor.c 2018-09-11 15:53:18.000000000 +0200 @@ -720,11 +720,6 @@ G_CALLBACK (entry_changed_cb), editor); - g_signal_connect (priv->entry, - "key-press-event", - G_CALLBACK (on_key_press_event), - editor); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->entry), GTK_ENTRY_ICON_PRIMARY, "edit-find-symbolic"); @@ -882,8 +877,17 @@ g_clear_pointer (&editor->priv->base_uri, g_free); editor->priv->base_uri = base_uri; + g_signal_connect (editor->priv->entry, + "key-press-event", + G_CALLBACK (on_key_press_event), + editor); + update_fav_icon (editor); } else { + g_signal_handlers_disconnect_by_func (editor->priv->entry, + on_key_press_event, + editor); + gtk_widget_hide (editor->priv->infobar); } }
