Hello community,
here is the log from the commit of package muffin for openSUSE:Factory checked
in at 2016-05-23 16:39:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/muffin (Old)
and /work/SRC/openSUSE:Factory/.muffin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2016-05-13
09:24:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.muffin.new/muffin.changes 2016-05-23
16:40:10.000000000 +0200
@@ -1,0 +2,11 @@
+Sun May 22 15:13:43 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 3.0.4:
+ * Use g_clear_pointer to clean up finalisation code.
+ * window-actor: Remove custom region destruction methods with
+ g_clear_pointer.
+ * constraints.c: Ignore snapped windows whe maximising desktop
+ windows.
+ * window-actor: Fix leaked frame list.
+
+-------------------------------------------------------------------
Old:
----
muffin-3.0.3.tar.gz
New:
----
muffin-3.0.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muffin.spec ++++++
--- /var/tmp/diff_new_pack.BLfd6d/_old 2016-05-23 16:40:11.000000000 +0200
+++ /var/tmp/diff_new_pack.BLfd6d/_new 2016-05-23 16:40:11.000000000 +0200
@@ -20,7 +20,7 @@
%define sover 0
%define typelib typelib-1_0-MetaMuffin-0_0
Name: muffin
-Version: 3.0.3
+Version: 3.0.4
Release: 0
Summary: Cinnamon Desktop default window manager
License: GPL-2.0+ and MIT
++++++ muffin-3.0.3.tar.gz -> muffin-3.0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.0.3/configure.ac
new/muffin-3.0.4/configure.ac
--- old/muffin-3.0.3/configure.ac 2016-05-11 15:15:55.000000000 +0200
+++ new/muffin-3.0.4/configure.ac 2016-05-20 14:10:58.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([muffin_major_version], [3])
m4_define([muffin_minor_version], [0])
-m4_define([muffin_micro_version], [3])
+m4_define([muffin_micro_version], [4])
m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])
@@ -413,9 +413,6 @@
CFLAGS="$CFLAGS -g -O"
fi
-# For fix-meta-rectangle.py
-AM_PATH_PYTHON([2.5])
-
# Use gnome-doc-utils:
GNOME_DOC_INIT([0.8.0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.0.3/debian/changelog
new/muffin-3.0.4/debian/changelog
--- old/muffin-3.0.3/debian/changelog 2016-05-11 15:15:55.000000000 +0200
+++ new/muffin-3.0.4/debian/changelog 2016-05-20 14:10:58.000000000 +0200
@@ -1,3 +1,26 @@
+muffin (3.0.4) sarah; urgency=medium
+
+ [ brownsr ]
+ * remove unnecessary check
https://github.com/GNOME/mutter/commit/9ca00d5cce2c5783c377b4df8b3f6820f9f357b0
+ * remove unused variable
https://github.com/GNOME/mutter/commit/a6f206f07cf2fe7bc0c71ca5e571345f848efdbc#diff-5d2e6395ac2f32aae711a05663b64d18
+ * remove unused field
https://github.com/GNOME/mutter/commit/73dbb4b9a52c651868057590e71616e8a5b726b2#diff-5d2e6395ac2f32aae711a05663b64d18
+ * remove unused description
https://github.com/GNOME/mutter/commit/51acc3ee3178754b16b17362bb9b0395ef9a4e9b#diff-5d2e6395ac2f32aae711a05663b64d18
please check to see this looks right for muffin. No regressions seen
+
+ [ itzexor ]
+ * autoconf: remove unneeded check for python python has never been used in
muffin, this is a remnant from a workaround that was introduced to mutter in
2010, and removed before muffin was forked.
+
+ [ brownsr ]
+ * use g_clear_pointer to clean up finalization code
https://github.com/GNOME/mutter/commit/079dd60e3d5cd6a6e1070f89f4f7277423bda727#diff-5d2e6395ac2f32aae711a05663b64d18
+ * window-actor: Remove custom region destruction methods with g_clear_p…
…ointer
https://github.com/GNOME/mutter/commit/53534b4ded26a392cce9b565de8b5d81cc904a0e#diff-5d2e6395ac2f32aae711a05663b64d18
+
+ [ Michael Webster ]
+ * constraints.c: ignore snapped windows whe maximizing desktop windows.
+
+ [ brownsr ]
+ * window-actor: fix leaked frame list
https://github.com/GNOME/mutter/commit/4d437e32e069d348e9ff55bdaf34cfec60b0c7e3
+
+ -- Clement Lefebvre <r...@linuxmint.com> Fri, 20 May 2016 13:10:14 +0100
+
muffin (3.0.3) sarah; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.0.3/src/compositor/meta-window-actor.c
new/muffin-3.0.4/src/compositor/meta-window-actor.c
--- old/muffin-3.0.3/src/compositor/meta-window-actor.c 2016-05-11
15:15:55.000000000 +0200
+++ new/muffin-3.0.4/src/compositor/meta-window-actor.c 2016-05-20
14:10:58.000000000 +0200
@@ -66,9 +66,6 @@
Damage damage;
guint8 opacity;
- guint8 shadow_opacity;
-
- gchar * desc;
/* If the window is shaped, a region that matches the shape */
cairo_region_t *shape_region;
@@ -127,8 +124,6 @@
guint no_shadow : 1;
- guint no_more_x_calls : 1;
-
guint unredirected : 1;
/* This is used to detect fullscreen windows that need to be unredirected */
@@ -182,10 +177,6 @@
static void meta_window_actor_detach (MetaWindowActor *self);
static gboolean meta_window_actor_has_shadow (MetaWindowActor *self);
-static void meta_window_actor_clear_shape_region (MetaWindowActor *self);
-static void meta_window_actor_clear_bounding_region (MetaWindowActor *self);
-static void meta_window_actor_clear_shadow_clip (MetaWindowActor *self);
-
static void meta_window_actor_handle_updates (MetaWindowActor *self);
static void check_needs_reshape (MetaWindowActor *self);
@@ -366,9 +357,6 @@
priv->damage = None;
}
- g_free (priv->desc);
- priv->desc = NULL;
-
priv->xwindow = new_xwindow;
/*
@@ -472,33 +460,14 @@
meta_window_actor_detach (self);
- meta_window_actor_clear_shape_region (self);
- meta_window_actor_clear_bounding_region (self);
- meta_window_actor_clear_shadow_clip (self);
-
- if (priv->shadow_class != NULL)
- {
- g_free (priv->shadow_class);
- priv->shadow_class = NULL;
- }
-
- if (priv->focused_shadow != NULL)
- {
- meta_shadow_unref (priv->focused_shadow);
- priv->focused_shadow = NULL;
- }
-
- if (priv->unfocused_shadow != NULL)
- {
- meta_shadow_unref (priv->unfocused_shadow);
- priv->unfocused_shadow = NULL;
- }
-
- if (priv->shadow_shape != NULL)
- {
- meta_window_shape_unref (priv->shadow_shape);
- priv->shadow_shape = NULL;
- }
+ g_clear_pointer (&priv->shape_region, cairo_region_destroy);
+ g_clear_pointer (&priv->bounding_region, cairo_region_destroy);
+ g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);
+
+ g_clear_pointer (&priv->shadow_class, g_free);
+ g_clear_pointer (&priv->focused_shadow, meta_shadow_unref);
+ g_clear_pointer (&priv->unfocused_shadow, meta_shadow_unref);
+ g_clear_pointer (&priv->shadow_shape, meta_window_shape_unref);
if (priv->damage != None)
{
@@ -511,17 +480,12 @@
info->windows = g_list_remove (info->windows, (gconstpointer) self);
- if (priv->window)
- {
- g_object_unref (priv->window);
- priv->window = NULL;
- }
+ g_clear_object (&priv->window);
/*
* Release the extra reference we took on the actor.
*/
- g_object_unref (priv->actor);
- priv->actor = NULL;
+ g_clear_object (&priv->actor);
G_OBJECT_CLASS (meta_window_actor_parent_class)->dispose (object);
}
@@ -531,9 +495,7 @@
{
MetaWindowActor *self = META_WINDOW_ACTOR (object);
MetaWindowActorPrivate *priv = self->priv;
-
- g_free (priv->desc);
-
+ g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free);
G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object);
}
@@ -934,25 +896,6 @@
return meta_window_is_override_redirect (self->priv->window);
}
-const char *meta_window_actor_get_description (MetaWindowActor *self)
-{
- /*
- * For windows managed by the WM, we just defer to the WM for the window
- * description. For override-redirect windows, we create the description
- * ourselves, but only on demand.
- */
- if (self->priv->window)
- return meta_window_get_description (self->priv->window);
-
- if (G_UNLIKELY (self->priv->desc == NULL))
- {
- self->priv->desc = g_strdup_printf ("Override Redirect (0x%x)",
- (guint) self->priv->xwindow);
- }
-
- return self->priv->desc;
-}
-
/**
* meta_window_actor_get_workspace:
* @self: #MetaWindowActor
@@ -1422,14 +1365,6 @@
priv->needs_destroy = TRUE;
- /*
- * Once the window destruction is initiated we can no longer perform any
- * furter X-based operations. For example, if we have a Map effect running,
- * we cannot query the window geometry once the effect completes. So, flag
- * this.
- */
- priv->no_more_x_calls = TRUE;
-
if (!meta_window_actor_effect_in_progress (self))
clutter_actor_destroy (CLUTTER_ACTOR (self));
}
@@ -1717,42 +1652,6 @@
}
static void
-meta_window_actor_clear_shape_region (MetaWindowActor *self)
-{
- MetaWindowActorPrivate *priv = self->priv;
-
- if (priv->shape_region)
- {
- cairo_region_destroy (priv->shape_region);
- priv->shape_region = NULL;
- }
-}
-
-static void
-meta_window_actor_clear_bounding_region (MetaWindowActor *self)
-{
- MetaWindowActorPrivate *priv = self->priv;
-
- if (priv->bounding_region)
- {
- cairo_region_destroy (priv->bounding_region);
- priv->bounding_region = NULL;
- }
-}
-
-static void
-meta_window_actor_clear_shadow_clip (MetaWindowActor *self)
-{
- MetaWindowActorPrivate *priv = self->priv;
-
- if (priv->shadow_clip)
- {
- cairo_region_destroy (priv->shadow_clip);
- priv->shadow_clip = NULL;
- }
-}
-
-static void
meta_window_actor_update_bounding_region_and_borders (MetaWindowActor *self,
int width,
int height)
@@ -1792,7 +1691,7 @@
priv->last_borders = borders;
- meta_window_actor_clear_bounding_region (self);
+ g_clear_pointer (&priv->bounding_region, cairo_region_destroy);
priv->bounding_region = cairo_region_create_rectangle (&bounding_rectangle);
@@ -1807,7 +1706,7 @@
{
MetaWindowActorPrivate *priv = self->priv;
- meta_window_actor_clear_shape_region (self);
+ g_clear_pointer (&priv->shape_region, cairo_region_destroy);
/* region must be non-null */
priv->shape_region = region;
@@ -1916,7 +1815,7 @@
if (appears_focused ? priv->focused_shadow : priv->unfocused_shadow)
{
- meta_window_actor_clear_shadow_clip (self);
+ g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);
priv->shadow_clip = cairo_region_copy (beneath_region);
if (clip_shadow_under_window (self))
@@ -1941,7 +1840,7 @@
meta_shaped_texture_set_clip_region (META_SHAPED_TEXTURE (priv->actor),
NULL);
- meta_window_actor_clear_shadow_clip (self);
+ g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);
}
static void
@@ -2306,7 +2205,7 @@
return;
meta_shaped_texture_set_shape_region (META_SHAPED_TEXTURE (priv->actor),
NULL);
- meta_window_actor_clear_shape_region (self);
+ g_clear_pointer (&priv->shape_region, cairo_region_destroy);;
if (priv->shadow_shape != NULL)
{
@@ -2341,16 +2240,8 @@
client_area.width = priv->window->rect.width;
client_area.height = priv->window->rect.height;
- if (priv->window->frame)
- {
- client_area.x = borders.total.left;
- client_area.y = borders.total.top;
- }
- else
- {
- client_area.x = 0;
- client_area.y = 0;
- }
+ client_area.x = borders.total.left;
+ client_area.y = borders.total.top;
/* Punch out client area. */
cairo_region_subtract_rectangle (region, &client_area);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.0.3/src/core/constraints.c
new/muffin-3.0.4/src/core/constraints.c
--- old/muffin-3.0.3/src/core/constraints.c 2016-05-11 15:15:55.000000000
+0200
+++ new/muffin-3.0.4/src/core/constraints.c 2016-05-20 14:10:58.000000000
+0200
@@ -822,7 +822,8 @@
return TRUE;
/* Calculate target_size = maximized size of (window + frame) */
- if (META_WINDOW_MAXIMIZED (window) && g_list_length
(window->workspace->snapped_windows) == 0)
+ if (META_WINDOW_MAXIMIZED (window) &&
+ (g_list_length (window->workspace->snapped_windows) == 0 || window->type
== META_WINDOW_DESKTOP))
{
target_size = info->work_area_monitor;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.0.3/src/meta/meta-window-actor.h
new/muffin-3.0.4/src/meta/meta-window-actor.h
--- old/muffin-3.0.3/src/meta/meta-window-actor.h 2016-05-11
15:15:55.000000000 +0200
+++ new/muffin-3.0.4/src/meta/meta-window-actor.h 2016-05-20
14:10:58.000000000 +0200
@@ -63,7 +63,6 @@
MetaWindow * meta_window_actor_get_meta_window (MetaWindowActor
*self);
ClutterActor * meta_window_actor_get_texture (MetaWindowActor
*self);
gboolean meta_window_actor_is_override_redirect (MetaWindowActor
*self);
-const char * meta_window_actor_get_description (MetaWindowActor
*self);
gboolean meta_window_actor_showing_on_its_workspace (MetaWindowActor
*self);
gboolean meta_window_actor_is_destroyed (MetaWindowActor *self);
