Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2017-11-19 11:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Sun Nov 19 11:12:52 2017 rev:20 rq:542730 version:3.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2017-11-13 14:06:18.665337155 +0100 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2017-11-19 11:12:57.555956959 +0100 @@ -1,0 +2,10 @@ +Sat Nov 18 00:00:12 UTC 2017 - [email protected] + +- Update to version 3.6.3: + * nemo-desktop-manager.c: Account for scale factor when using + cinnamon- supplied monitor info. Cinnamon runs at a scale + factor of 1 always, and things are scaled internally. + * dnd: Make sure to clear any source_fs pointers after dnd + operations. + +------------------------------------------------------------------- Old: ---- nemo-3.6.2.tar.gz New: ---- nemo-3.6.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.rRBrPi/_old 2017-11-19 11:12:58.371927208 +0100 +++ /var/tmp/diff_new_pack.rRBrPi/_new 2017-11-19 11:12:58.375927062 +0100 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.6.2 +Version: 3.6.3 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0+ ++++++ nemo-3.6.2.tar.gz -> nemo-3.6.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/configure.ac new/nemo-3.6.3/configure.ac --- old/nemo-3.6.2/configure.ac 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/configure.ac 2017-11-17 11:52:45.000000000 +0100 @@ -19,7 +19,7 @@ m4_define(nemo_extension_current, 5) m4_define(nemo_extension_revision, 0) -AC_INIT(nemo, 3.6.2, https://github.com/linuxmint/nemo) +AC_INIT(nemo, 3.6.3, https://github.com/linuxmint/nemo) dnl =========================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/debian/changelog new/nemo-3.6.3/debian/changelog --- old/nemo-3.6.2/debian/changelog 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/debian/changelog 2017-11-17 11:52:45.000000000 +0100 @@ -1,3 +1,11 @@ +nemo (3.6.3) sylvia; urgency=medium + + [ Michael Webster ] + * nemo-desktop-manager.c: Account for scale factor when using cinnamon- supplied monitor info. Cinnamon runs at a scale factor of 1 always, and things are scaled internally. + * dnd: Make sure to clear any source_fs pointers after dnd operations. + + -- Clement Lefebvre <[email protected]> Fri, 27 Oct 2017 11:03:15 +0100 + nemo (3.6.2) sylvia; urgency=medium [ Leigh Scott ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/libnemo-private/nemo-desktop-utils.c new/nemo-3.6.3/libnemo-private/nemo-desktop-utils.c --- old/nemo-3.6.2/libnemo-private/nemo-desktop-utils.c 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/libnemo-private/nemo-desktop-utils.c 2017-11-17 11:52:45.000000000 +0100 @@ -162,4 +162,22 @@ return FALSE; } +gint +nemo_desktop_utils_get_scale_factor (void) +{ + guint scale; + GValue value = G_VALUE_INIT; + + ensure_screen (); + + g_value_init (&value, G_TYPE_UINT); + + if (gdk_screen_get_setting (default_screen, "gdk-window-scaling-factor", &value)) { + scale = g_value_get_uint (&value); + } else { + scale = 1; + } + + return (gint) scale; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/libnemo-private/nemo-desktop-utils.h new/nemo-3.6.3/libnemo-private/nemo-desktop-utils.h --- old/nemo-3.6.2/libnemo-private/nemo-desktop-utils.h 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/libnemo-private/nemo-desktop-utils.h 2017-11-17 11:52:45.000000000 +0100 @@ -33,6 +33,7 @@ gint nemo_desktop_utils_get_monitor_for_widget (GtkWidget *widget); gint nemo_desktop_utils_get_num_monitors (void); gboolean nemo_desktop_utils_get_monitor_cloned (gint monitor, gint x_primary); +gint nemo_desktop_utils_get_scale_factor (void); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/libnemo-private/nemo-dnd.c new/nemo-3.6.3/libnemo-private/nemo-dnd.c --- old/nemo-3.6.2/libnemo-private/nemo-dnd.c 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/libnemo-private/nemo-dnd.c 2017-11-17 11:52:45.000000000 +0100 @@ -395,10 +395,6 @@ result = FALSE; - if (target_file != NULL && source_fs_for_desktop != NULL) { - - } - if (target_file != NULL && source_file != NULL) { source_id = nemo_file_get_filesystem_id (source_file); target_id = nemo_file_get_filesystem_id (target_file); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/libnemo-private/nemo-icon-dnd.c new/nemo-3.6.3/libnemo-private/nemo-icon-dnd.c --- old/nemo-3.6.2/libnemo-private/nemo-icon-dnd.c 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/libnemo-private/nemo-icon-dnd.c 2017-11-17 11:52:45.000000000 +0100 @@ -581,6 +581,7 @@ nemo_drag_destroy_selection_list (dnd_info->drag_info.selection_list); dnd_info->drag_info.selection_list = NULL; + g_clear_pointer (&dnd_info->drag_info.source_fs, g_free); } static NemoIcon * @@ -1415,6 +1416,8 @@ g_free (drop_target); nemo_drag_destroy_selection_list (container->details->dnd_info->drag_info.selection_list); + + g_clear_pointer (&container->details->dnd_info->drag_info.source_fs, g_free); container->details->dnd_info->drag_info.selection_list = NULL; free_dnd_grid (container); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/src/nemo-desktop-manager.c new/nemo-3.6.3/src/nemo-desktop-manager.c --- old/nemo-3.6.2/src/nemo-desktop-manager.c 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/src/nemo-desktop-manager.c 2017-11-17 11:52:45.000000000 +0100 @@ -208,6 +208,7 @@ GVariant *out_rect_var; GdkRectangle out_rect; gsize n_elem; + gint scale_factor; GError *error; error = NULL; @@ -235,6 +236,14 @@ out_rect = *( (GdkRectangle *) g_variant_get_fixed_array (out_rect_var, &n_elem, sizeof(gint)) ); + /* GdkScreen sizes are scaled for hidpi already. But if we've gotten this far, we're using + * Cinnamon-provided numbers, which aren't scaled. */ + + scale_factor = nemo_desktop_utils_get_scale_factor (); + + out_rect.width /= scale_factor; + out_rect.height /= scale_factor; + out: rect->x = out_rect.x; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.2/src/nemo-window-slot-dnd.c new/nemo-3.6.3/src/nemo-window-slot-dnd.c --- old/nemo-3.6.2/src/nemo-window-slot-dnd.c 2017-10-24 13:26:17.000000000 +0200 +++ new/nemo-3.6.3/src/nemo-window-slot-dnd.c 2017-11-17 11:52:45.000000000 +0100 @@ -149,6 +149,7 @@ if (drag_info->info == NEMO_ICON_DND_GNOME_ICON_LIST) { nemo_drag_destroy_selection_list (drag_info->data.selection_list); + g_clear_pointer (&drag_info->desktop_dnd_source_fs, g_free); } else if (drag_info->info == NEMO_ICON_DND_URI_LIST) { g_list_free (drag_info->data.uri_list); } else if (drag_info->info == NEMO_ICON_DND_NETSCAPE_URL) {
