Hello community, here is the log from the commit of package muffin for openSUSE:Factory checked in at 2017-08-22 11:10:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/muffin (Old) and /work/SRC/openSUSE:Factory/.muffin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin" Tue Aug 22 11:10:35 2017 rev:12 rq:518001 version:3.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2017-05-27 13:14:47.821770850 +0200 +++ /work/SRC/openSUSE:Factory/.muffin.new/muffin.changes 2017-08-22 11:10:40.835487555 +0200 @@ -1,0 +2,16 @@ +Sun Aug 20 16:09:40 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 3.4.1: + * Allow keyboard window switching (alt-Tab) during drag-and-drop. + * Don't add invisible resize borders to fullscreen windows. + * Fix a crash when toplevel windows were set to unexpected + window types. + * Correct problems with windows moving when restarting or + switching window managers. + * Fix interaction of tiled windows with multiple monitors. + * Make meta_display_unmanage_screen() public. + * Fix a problem with turning off window decorations on the fly. + * Fix spurious assertion failures with themes such as Nodoka. + * Misc. bug fixes. + +------------------------------------------------------------------- Old: ---- muffin-3.4.0.tar.gz New: ---- muffin-3.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muffin.spec ++++++ --- /var/tmp/diff_new_pack.DvZVRd/_old 2017-08-22 11:10:42.171299465 +0200 +++ /var/tmp/diff_new_pack.DvZVRd/_new 2017-08-22 11:10:42.179298339 +0200 @@ -20,7 +20,7 @@ %define sover 0 %define typelib typelib-1_0-MetaMuffin-0_0 Name: muffin -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: Cinnamon Desktop default window manager License: GPL-2.0+ and MIT ++++++ muffin-3.4.0.tar.gz -> muffin-3.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/.github/ISSUE_TEMPLATE.md new/muffin-3.4.1/.github/ISSUE_TEMPLATE.md --- old/muffin-3.4.0/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 +++ new/muffin-3.4.1/.github/ISSUE_TEMPLATE.md 2017-08-08 13:15:34.000000000 +0200 @@ -0,0 +1,21 @@ + +``` + * muffin version (muffin --version or 'dpkg --list | grep libmuffin0' for Mint/Ubuntu) + * Distribution - (Mint 17.2, Arch, Fedora 25, etc...) + * Graphics hardware *and* driver used + * 32 or 64 bit + ``` + +**Issue** + + + +**Steps to reproduce** + + + +**Expected behaviour** + + + +**Other information** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/autogen.sh new/muffin-3.4.1/autogen.sh --- old/muffin-3.4.0/autogen.sh 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/autogen.sh 2017-08-08 13:15:34.000000000 +0200 @@ -22,7 +22,8 @@ echo "" >&2 fi -aclocal --install || exit 1 +mkdir -p m4 + glib-gettextize --force --copy || exit 1 gtkdocize --copy || exit 1 intltoolize --force --copy --automake || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/configure.ac new/muffin-3.4.1/configure.ac --- old/muffin-3.4.0/configure.ac 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/configure.ac 2017-08-08 13:15:34.000000000 +0200 @@ -2,7 +2,7 @@ m4_define([muffin_major_version], [3]) m4_define([muffin_minor_version], [4]) -m4_define([muffin_micro_version], [0]) +m4_define([muffin_micro_version], [1]) m4_define([muffin_version], [muffin_major_version.muffin_minor_version.muffin_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/debian/changelog new/muffin-3.4.1/debian/changelog --- old/muffin-3.4.0/debian/changelog 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/debian/changelog 2017-08-08 13:15:34.000000000 +0200 @@ -1,3 +1,22 @@ +muffin (3.4.1) sonya; urgency=medium + + [ leigh123linux ] + * remove aclocal from autogen.sh as autoreconf calls it (#285) + + [ JosephMcc ] + * meta-background-actor: Fix a warning when dispose is run multiple times + + [ Michael Webster ] + * core/util.c: Replace "Window manager" with "Cinnamon" for better logging clarity. + * add an issue template + * display.c: Re-set the button grabs on the frame xwindow as well as the client window, when the preferences change. + * window, window-props: Include window scale factor into a window's size hint sanity checks and the resize popup visibility check. + + [ Jose Marino ] + * keybindings: fix erratic raise_or_lower behavior + + -- Clement Lefebvre <r...@linuxmint.com> Tue, 08 Aug 2017 13:11:49 +0200 + muffin (3.4.0) sonya; urgency=medium [ leigh123linux ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/compositor/meta-background-actor.c new/muffin-3.4.1/src/compositor/meta-background-actor.c --- old/muffin-3.4.0/src/compositor/meta-background-actor.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/compositor/meta-background-actor.c 2017-08-08 13:15:34.000000000 +0200 @@ -323,6 +323,12 @@ priv->background = NULL; } + if (priv->top_actor != NULL) + priv->top_actor = NULL; + + if (priv->bottom_actor != NULL) + priv->bottom_actor = NULL; + G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object); } @@ -609,7 +615,8 @@ priv = self->priv; - meta_background_set_visible_region (META_BACKGROUND (priv->top_actor), visible_region); + if (priv->top_actor != NULL) + meta_background_set_visible_region (META_BACKGROUND (priv->top_actor), visible_region); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/core/display.c new/muffin-3.4.1/src/core/display.c --- old/muffin-3.4.0/src/core/display.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/core/display.c 2017-08-08 13:15:34.000000000 +0200 @@ -5339,6 +5339,12 @@ { MetaWindow *w = tmp->data; meta_display_ungrab_window_buttons (display, w->xwindow); + + if (w->frame) + { + meta_display_ungrab_window_buttons (display, w->frame->xwindow); + } + meta_display_ungrab_focus_window_button (display, w); tmp = tmp->next; } @@ -5361,6 +5367,11 @@ { meta_display_grab_focus_window_button (display, w); meta_display_grab_window_buttons (display, w->xwindow); + + if (w->frame) + { + meta_display_grab_window_buttons (display, w->frame->xwindow); + } } tmp = tmp->next; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/core/keybindings.c new/muffin-3.4.1/src/core/keybindings.c --- old/muffin-3.4.0/src/core/keybindings.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/core/keybindings.c 2017-08-08 13:15:34.000000000 +0200 @@ -2963,7 +2963,7 @@ { MetaRectangle tmp, win_rect, above_rect; - if (above->mapped) + if (above->mapped && meta_window_should_be_showing(above)) { meta_window_get_outer_rect (window, &win_rect); meta_window_get_outer_rect (above, &above_rect); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/core/util.c new/muffin-3.4.1/src/core/util.c --- old/muffin-3.4.0/src/core/util.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/core/util.c 2017-08-08 13:15:34.000000000 +0200 @@ -295,7 +295,7 @@ out = logfile ? logfile : stderr; if (no_prefix == 0) - utf8_fputs ("Window manager: ", out); + utf8_fputs ("muffin: ", out); utf8_fputs (str, out); fflush (out); @@ -443,7 +443,7 @@ #endif if (no_prefix == 0) - utf8_fputs ("Bug in window manager: ", out); + utf8_fputs ("Bug in muffin: ", out); utf8_fputs (str, out); fflush (out); @@ -476,7 +476,7 @@ #endif if (no_prefix == 0) - utf8_fputs ("Window manager warning: ", out); + utf8_fputs ("Cinnamon warning: ", out); utf8_fputs (str, out); fflush (out); @@ -504,7 +504,7 @@ #endif if (no_prefix == 0) - utf8_fputs ("Window manager error: ", out); + utf8_fputs ("Cinnamon error: ", out); utf8_fputs (str, out); fflush (out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/core/window-props.c new/muffin-3.4.1/src/core/window-props.c --- old/muffin-3.4.0/src/core/window-props.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/core/window-props.c 2017-08-08 13:15:34.000000000 +0200 @@ -1082,10 +1082,14 @@ { int x, y, w, h; double minr, maxr; + gint ui_scale; + /* Some convenience vars */ int minw, minh, maxw, maxh; /* min/max width/height */ int basew, baseh, winc, hinc; /* base width/height, width/height increment */ + ui_scale = meta_prefs_get_ui_scale (); + /* Save the last ConfigureRequest, which we put here. * Values here set in the hints are supposed to * be ignored. @@ -1184,8 +1188,8 @@ } else { - window->size_hints.width_inc = 1; - window->size_hints.height_inc = 1; + window->size_hints.width_inc = ui_scale; + window->size_hints.height_inc = ui_scale; window->size_hints.flags |= PResizeInc; } @@ -1228,51 +1232,51 @@ /*** Lots of sanity checking ***/ /* Verify all min & max hints are at least 1 pixel */ - if (window->size_hints.min_width < 1) + if (window->size_hints.min_width < ui_scale) { /* someone is on crack */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min width to 0, which makes no sense\n", window->desc); - window->size_hints.min_width = 1; + window->size_hints.min_width = ui_scale; } - if (window->size_hints.max_width < 1) + if (window->size_hints.max_width < ui_scale) { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max width to 0, which makes no sense\n", window->desc); - window->size_hints.max_width = 1; + window->size_hints.max_width = ui_scale; } - if (window->size_hints.min_height < 1) + if (window->size_hints.min_height < ui_scale) { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min height to 0, which makes no sense\n", window->desc); - window->size_hints.min_height = 1; + window->size_hints.min_height = ui_scale; } - if (window->size_hints.max_height < 1) + if (window->size_hints.max_height < ui_scale) { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max height to 0, which makes no sense\n", window->desc); - window->size_hints.max_height = 1; + window->size_hints.max_height = ui_scale; } /* Verify size increment hints are at least 1 pixel */ - if (window->size_hints.width_inc < 1) + if (window->size_hints.width_inc < ui_scale) { /* app authors find so many ways to smoke crack */ - window->size_hints.width_inc = 1; - meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 width_inc to 1\n"); + window->size_hints.width_inc = ui_scale; + meta_topic (META_DEBUG_GEOMETRY, "Corrected too-small width_inc to window scale factor\n"); } - if (window->size_hints.height_inc < 1) + if (window->size_hints.height_inc < ui_scale) { /* another cracksmoker */ - window->size_hints.height_inc = 1; - meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 height_inc to 1\n"); + window->size_hints.height_inc = ui_scale; + meta_topic (META_DEBUG_GEOMETRY, "Corrected too-small height_inc to window scale factor\n"); } /* divide by 0 cracksmokers; note that x & y in (min|max)_aspect are * numerator & denominator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.0/src/core/window.c new/muffin-3.4.1/src/core/window.c --- old/muffin-3.4.0/src/core/window.c 2017-05-03 14:37:30.000000000 +0200 +++ new/muffin-3.4.1/src/core/window.c 2017-08-08 13:15:34.000000000 +0200 @@ -10583,11 +10583,17 @@ if (window->display->grab_resize_popup == NULL) { - if (window->size_hints.width_inc > 1 || - window->size_hints.height_inc > 1) - window->display->grab_resize_popup = - meta_ui_resize_popup_new (window->display->xdisplay, - window->screen->number); + gint scale; + + scale = meta_prefs_get_ui_scale (); + + if (window->size_hints.width_inc > scale || + window->size_hints.height_inc > scale) + { + window->display->grab_resize_popup = + meta_ui_resize_popup_new (window->display->xdisplay, + window->screen->number); + } } if (window->display->grab_resize_popup != NULL)