Hello community,
here is the log from the commit of package muffin for openSUSE:Factory checked
in at 2020-03-19 19:50:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/muffin (Old)
and /work/SRC/openSUSE:Factory/.muffin.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin"
Thu Mar 19 19:50:43 2020 rev:21 rq:786349 version:4.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2019-12-02
11:35:45.926432803 +0100
+++ /work/SRC/openSUSE:Factory/.muffin.new.3160/muffin.changes 2020-03-19
19:54:11.480277450 +0100
@@ -1,0 +2,11 @@
+Wed Mar 18 12:03:33 UTC 2020 - Aaron Stern <ukbeas...@protonmail.com>
+
+- Update to version 4.4.2
+ * meta-window-actor.c: Make sure to remove any existing desaturate effect
when the window no longer has a shadow.
+ * src/ui/theme.c: Use a simpler method for getting an image file's
dimensions before scaling it for hidpi.
+ * meta-window-actor.c: Detach after redirecting, not before unredirecting.
+ * MetaWindow: clear the cached window icon when _NET_WM_ICON changes, to
force a regen the next time the icon is requested for the window.
+
+
+
+-------------------------------------------------------------------
Old:
----
muffin-4.4.1.tar.gz
New:
----
muffin-4.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muffin.spec ++++++
--- /var/tmp/diff_new_pack.QNsuKZ/_old 2020-03-19 19:54:12.104277473 +0100
+++ /var/tmp/diff_new_pack.QNsuKZ/_new 2020-03-19 19:54:12.108277473 +0100
@@ -21,7 +21,7 @@
%define typelib typelib-1_0-Muffin-0_0
%define _lto_cflags %{nil}
Name: muffin
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Summary: Cinnamon Desktop default window manager
License: GPL-2.0-or-later AND MIT
++++++ muffin-4.4.1.tar.gz -> muffin-4.4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/configure.ac
new/muffin-4.4.2/configure.ac
--- old/muffin-4.4.1/configure.ac 2019-11-22 10:46:43.000000000 +0100
+++ new/muffin-4.4.2/configure.ac 2019-12-28 12:54:21.000000000 +0100
@@ -2,7 +2,7 @@
m4_define([muffin_major_version], [4])
m4_define([muffin_minor_version], [4])
-m4_define([muffin_micro_version], [1])
+m4_define([muffin_micro_version], [2])
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-4.4.1/debian/changelog
new/muffin-4.4.2/debian/changelog
--- old/muffin-4.4.1/debian/changelog 2019-11-22 10:46:43.000000000 +0100
+++ new/muffin-4.4.2/debian/changelog 2019-12-28 12:54:21.000000000 +0100
@@ -1,3 +1,13 @@
+muffin (4.4.2) tricia; urgency=medium
+
+ [ Michael Webster ]
+ * meta-window-actor.c: Make sure to remove any existing desaturate effect
when the window no longer has a shadow.
+ * src/ui/theme.c: Use a simpler method for getting an image file's
dimensions before scaling it for hidpi.
+ * meta-window-actor.c: Detach after redirecting, not before unredirecting.
+ * MetaWindow: clear the cached window icon when _NET_WM_ICON changes, to
force a regen the next time the icon is requested for the window.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Sat, 28 Dec 2019 11:54:02 +0000
+
muffin (4.4.1) tricia; urgency=medium
* meta-shadow-factory: Fix terminal shadows (#540)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/src/compositor/meta-window-actor.c
new/muffin-4.4.2/src/compositor/meta-window-actor.c
--- old/muffin-4.4.1/src/compositor/meta-window-actor.c 2019-11-22
10:46:43.000000000 +0100
+++ new/muffin-4.4.2/src/compositor/meta-window-actor.c 2019-12-28
12:54:21.000000000 +0100
@@ -328,7 +328,7 @@
MetaWindowActor *window = META_WINDOW_ACTOR (actor);
MetaWindowActorPrivate *priv = window->priv;
- if (!priv->should_have_shadow)
+ if (!priv->should_have_shadow && !priv->has_desat_effect)
return;
guint8 opacity = clutter_actor_get_opacity (actor);
@@ -1600,11 +1600,11 @@
if (state)
{
XCompositeRedirectWindow (xdisplay, xwin, CompositeRedirectManual);
+ meta_window_actor_detach (self);
priv->unredirected = FALSE;
}
else
{
- meta_window_actor_detach (self);
XCompositeUnredirectWindow (xdisplay, xwin, CompositeRedirectManual);
priv->repaint_scheduled = TRUE;
priv->unredirected = TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/src/core/window-private.h
new/muffin-4.4.2/src/core/window-private.h
--- old/muffin-4.4.1/src/core/window-private.h 2019-11-22 10:46:43.000000000
+0100
+++ new/muffin-4.4.2/src/core/window-private.h 2019-12-28 12:54:21.000000000
+0100
@@ -842,4 +842,5 @@
void meta_window_get_client_area_rect (const MetaWindow *window,
cairo_rectangle_int_t *rect);
+void meta_window_icon_changed (MetaWindow *window);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/src/core/window-props.c
new/muffin-4.4.2/src/core/window-props.c
--- old/muffin-4.4.1/src/core/window-props.c 2019-11-22 10:46:43.000000000
+0100
+++ new/muffin-4.4.2/src/core/window-props.c 2019-12-28 12:54:21.000000000
+0100
@@ -340,7 +340,7 @@
reload_icon (MetaWindow *window,
Atom atom)
{
- g_signal_emit_by_name (window, "icon-changed", window);
+ meta_window_icon_changed (window);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/src/core/window.c
new/muffin-4.4.2/src/core/window.c
--- old/muffin-4.4.1/src/core/window.c 2019-11-22 10:46:43.000000000 +0100
+++ new/muffin-4.4.2/src/core/window.c 2019-12-28 12:54:21.000000000 +0100
@@ -7991,6 +7991,13 @@
meta_window_recalc_window_type (window);
}
+void
+meta_window_icon_changed (MetaWindow *window)
+{
+ g_clear_object (&window->icon);
+ g_signal_emit (window, window_signals[ICON_CHANGED], 0, window);
+}
+
/**
* meta_window_create_icon:
* @window: a #MetaWindow
@@ -8010,7 +8017,7 @@
if (window->override_redirect)
return NULL;
- if (window->icon && size <= window->icon_size)
+ if (window->icon)
return window->icon;
icon = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.4.1/src/ui/theme.c
new/muffin-4.4.2/src/ui/theme.c
--- old/muffin-4.4.1/src/ui/theme.c 2019-11-22 10:46:43.000000000 +0100
+++ new/muffin-4.4.2/src/ui/theme.c 2019-12-28 12:54:21.000000000 +0100
@@ -5376,28 +5376,28 @@
else
{
char *full_path;
- full_path = g_build_filename (theme->dirname, filename, NULL);
+ gint width, height;
- GdkPixbuf *test_pixbuf = NULL;
- gint test_height, test_width;
+ full_path = g_build_filename (theme->dirname, filename, NULL);
- test_pixbuf = gdk_pixbuf_new_from_file (full_path, error);
- test_height = gdk_pixbuf_get_height (test_pixbuf);
- test_width = gdk_pixbuf_get_width (test_pixbuf);
+ if (gdk_pixbuf_get_file_info (full_path, &width, &height) == NULL)
+ {
+ g_free (full_path);
+ return NULL;
+ }
- g_object_unref (test_pixbuf);
+ width *= scale;
+ height *= scale;
- test_height *= scale;
- test_width *= scale;
+ pixbuf = gdk_pixbuf_new_from_file_at_size (full_path, width, height,
error);
- pixbuf = gdk_pixbuf_new_from_file_at_size (full_path, test_width,
test_height, error);
if (pixbuf == NULL)
{
- free (full_path);
+ g_free (full_path);
return NULL;
}
- free (full_path);
+ g_free (full_path);
}
g_hash_table_replace (theme->images_by_filename,
g_strdup (filename),
