Hello community, here is the log from the commit of package muffin for openSUSE:Factory checked in at 2017-11-10 14:55:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/muffin (Old) and /work/SRC/openSUSE:Factory/.muffin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin" Fri Nov 10 14:55:54 2017 rev:13 rq:538173 version:3.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2017-08-22 11:10:40.835487555 +0200 +++ /work/SRC/openSUSE:Factory/.muffin.new/muffin.changes 2017-11-10 14:55:55.575270803 +0100 @@ -1,0 +2,7 @@ +Sat Oct 28 19:57:36 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 3.6.0: + * x11/xprops: Plug a memory leak. + * Remove old things from the initial fork that seem not needed. + +------------------------------------------------------------------- Old: ---- muffin-3.4.1.tar.gz New: ---- muffin-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muffin.spec ++++++ --- /var/tmp/diff_new_pack.PGM05S/_old 2017-11-10 14:55:56.919222194 +0100 +++ /var/tmp/diff_new_pack.PGM05S/_new 2017-11-10 14:55:56.923222050 +0100 @@ -20,10 +20,10 @@ %define sover 0 %define typelib typelib-1_0-MetaMuffin-0_0 Name: muffin -Version: 3.4.1 +Version: 3.6.0 Release: 0 Summary: Cinnamon Desktop default window manager -License: GPL-2.0+ and MIT +License: GPL-2.0+ AND MIT Group: System/GUI/Other Url: https://github.com/linuxmint/muffin Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -121,18 +121,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} +%if 0%{?suse_version} <= 1320 %post %glib2_gsettings_schema_post %postun %glib2_gsettings_schema_postun +%endif %post -n %{soname}%{sover} -p /sbin/ldconfig %postun -n %{soname}%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS COPYING README README* rationales.txt debian/changelog %{_bindir}/%{name}* %{_libdir}/%{name}/ @@ -144,18 +145,14 @@ %{_datadir}/glib-2.0/schemas/*.gschema.xml %files lang -f %{name}.lang -%defattr(-,root,root) %files -n %{soname}%{sover} -%defattr(-,root,root) %{_libdir}/%{soname}.so.%{sover}* %files -n typelib-1_0-MetaMuffin-0_0 -%defattr(-,root,root) %{_libdir}/%{name}/Meta-Muffin.0.typelib %files devel -%defattr(-,root,root) %{_includedir}/%{name}/ %{_libdir}/%{soname}.so %{_libdir}/pkgconfig/%{soname}.pc ++++++ muffin-3.4.1.tar.gz -> muffin-3.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/configure.ac new/muffin-3.6.0/configure.ac --- old/muffin-3.4.1/configure.ac 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/configure.ac 2017-10-24 11:21:07.000000000 +0200 @@ -1,8 +1,8 @@ AC_PREREQ(2.50) m4_define([muffin_major_version], [3]) -m4_define([muffin_minor_version], [4]) -m4_define([muffin_micro_version], [1]) +m4_define([muffin_minor_version], [6]) +m4_define([muffin_micro_version], [0]) 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.1/debian/changelog new/muffin-3.6.0/debian/changelog --- old/muffin-3.4.1/debian/changelog 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/debian/changelog 2017-10-24 11:21:07.000000000 +0200 @@ -1,21 +1,12 @@ -muffin (3.4.1) sonya; urgency=medium +muffin (3.6.0) sylvia; urgency=medium - [ leigh123linux ] - * remove aclocal from autogen.sh as autoreconf calls it (#285) + [ Simon Brown ] + * x11/xprops: Plug a memory leak (#298) - [ JosephMcc ] - * meta-background-actor: Fix a warning when dispose is run multiple times + [ Fabio Fantoni ] + * Remove old things from initial fork that seems not needed - [ 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 + -- Clement Lefebvre <r...@linuxmint.com> Sat, 02 Sep 2017 16:56:12 -0400 muffin (3.4.0) sonya; urgency=medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/debian/muffin-common.catalog new/muffin-3.6.0/debian/muffin-common.catalog --- old/muffin-3.4.1/debian/muffin-common.catalog 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/debian/muffin-common.catalog 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -PUBLIC "-//MetacityTheme//DTD MetacityTheme 1.0//EN//XML" "metacity-theme.dtd" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/debian/muffin-common.docs new/muffin-3.6.0/debian/muffin-common.docs --- old/muffin-3.4.1/debian/muffin-common.docs 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/debian/muffin-common.docs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -doc/theme-format.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/debian/muffin-common.maintscript new/muffin-3.6.0/debian/muffin-common.maintscript --- old/muffin-3.4.1/debian/muffin-common.maintscript 1970-01-01 01:00:00.000000000 +0100 +++ new/muffin-3.6.0/debian/muffin-common.maintscript 2017-10-24 11:21:07.000000000 +0200 @@ -0,0 +1 @@ +rm_conffile /etc/sgml/muffin-common.cat 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/debian/muffin-common.sgmlcatalogs new/muffin-3.6.0/debian/muffin-common.sgmlcatalogs --- old/muffin-3.4.1/debian/muffin-common.sgmlcatalogs 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/debian/muffin-common.sgmlcatalogs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/muffin-common.catalog /usr/share/sgml/muffin-common/catalog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/core/window-private.h new/muffin-3.6.0/src/core/window-private.h --- old/muffin-3.4.1/src/core/window-private.h 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/core/window-private.h 2017-10-24 11:21:07.000000000 +0200 @@ -119,6 +119,13 @@ char *title; char *icon_name; + +/* XAppGtkWindow */ + char *theme_icon_name; + guint progress; + guint progress_pulse : 1; +/* /XappGtkWindow */ + GdkPixbuf *icon; GdkPixbuf *mini_icon; MetaIconCache icon_cache; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/core/window-props.c new/muffin-3.6.0/src/core/window-props.c --- old/muffin-3.4.1/src/core/window-props.c 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/core/window-props.c 2017-10-24 11:21:07.000000000 +0200 @@ -241,6 +241,85 @@ } static void +reload_theme_icon_name (MetaWindow *window, + MetaPropValue *value, + gboolean initial) +{ + g_free (window->theme_icon_name); + window->theme_icon_name = NULL; + + if (value->type != META_PROP_VALUE_INVALID) + window->theme_icon_name = g_strdup (value->v.str); + + meta_verbose ("Window theme icon name or path is \"%s\"\n", + window->theme_icon_name ? window->theme_icon_name : "unset"); +} + +static void +reload_progress (MetaWindow *window, + MetaPropValue *value, + gboolean initial) +{ + if (value->type != META_PROP_VALUE_INVALID) + { + if (window->progress != value->v.cardinal) + { + window->progress = value->v.cardinal; + g_object_notify (window, "progress"); + + meta_topic (META_DEBUG_WINDOW_STATE, + "Read XAppGtkWindow progress prop %u for %s\n", + window->progress, window->desc); + } + } + else + { + if (window->progress != 0) + { + window->progress = 0; + g_object_notify (window, "progress"); + + meta_topic (META_DEBUG_WINDOW_STATE, + "Read XAppGtkWindow progress prop %u for %s\n", + window->progress, window->desc); + } + } +} + +static void +reload_progress_pulse (MetaWindow *window, + MetaPropValue *value, + gboolean initial) +{ + if (value->type != META_PROP_VALUE_INVALID) + { + gboolean new_val = value->v.cardinal == 1; + + if (window->progress_pulse != new_val) + { + window->progress_pulse = new_val; + g_object_notify (window, "progress-pulse"); + + meta_topic (META_DEBUG_WINDOW_STATE, + "Read XAppGtkWindow progress-pulse prop %s for %s\n", + window->progress_pulse ? "TRUE" : "FALSE", window->desc); + } + } + else + { + if (window->progress_pulse) + { + window->progress_pulse = FALSE; + g_object_notify (window, "progress-pulse"); + + meta_topic (META_DEBUG_WINDOW_STATE, + "Read XAppGtkWindow progress-pulse prop %s for %s\n", + window->progress_pulse ? "TRUE" : "FALSE", window->desc); + } + } +} + +static void complain_about_broken_client (MetaWindow *window, MetaPropValue *value, gboolean initial) @@ -1807,6 +1886,9 @@ { display->atom__NET_WM_STRUT, META_PROP_VALUE_INVALID, reload_struts, FALSE, FALSE }, { display->atom__NET_WM_STRUT_PARTIAL, META_PROP_VALUE_INVALID, reload_struts, FALSE, FALSE }, { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL, reload_bypass_compositor, TRUE, TRUE }, + { display->atom__NET_WM_XAPP_ICON_NAME, META_PROP_VALUE_UTF8, reload_theme_icon_name, TRUE, TRUE }, + { display->atom__NET_WM_XAPP_PROGRESS, META_PROP_VALUE_CARDINAL, reload_progress, TRUE, TRUE }, + { display->atom__NET_WM_XAPP_PROGRESS_PULSE, META_PROP_VALUE_CARDINAL, reload_progress_pulse, TRUE, TRUE }, { 0 }, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/core/window.c new/muffin-3.6.0/src/core/window.c --- old/muffin-3.4.1/src/core/window.c 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/core/window.c 2017-10-24 11:21:07.000000000 +0200 @@ -189,7 +189,9 @@ PROP_GTK_APPLICATION_OBJECT_PATH, PROP_GTK_WINDOW_OBJECT_PATH, PROP_GTK_APP_MENU_OBJECT_PATH, - PROP_GTK_MENUBAR_OBJECT_PATH + PROP_GTK_MENUBAR_OBJECT_PATH, + PROP_PROGRESS, + PROP_PROGRESS_PULSE }; enum @@ -348,6 +350,12 @@ case PROP_GTK_MENUBAR_OBJECT_PATH: g_value_set_string (value, win->gtk_menubar_object_path); break; + case PROP_PROGRESS: + g_value_set_uint (value, win->progress); + break; + case PROP_PROGRESS_PULSE: + g_value_set_boolean (value, win->progress_pulse); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -573,6 +581,24 @@ NULL, G_PARAM_READABLE)); + g_object_class_install_property (object_class, + PROP_PROGRESS, + g_param_spec_uint ("progress", + "Progress", + "The progress of some long-running operation", + 0, + 100, + 0, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, + PROP_PROGRESS_PULSE, + g_param_spec_boolean ("progress-pulse", + "Pulsing progress", + "Show indeterminate or ongoing progress of an operation.", + FALSE, + G_PARAM_READABLE)); + window_signals[WORKSPACE_CHANGED] = g_signal_new ("workspace-changed", G_TYPE_FROM_CLASS (object_class), @@ -1110,6 +1136,7 @@ window->icon = NULL; window->mini_icon = NULL; meta_icon_cache_init (&window->icon_cache); + window->theme_icon_name = NULL; window->wm_hints_pixmap = None; window->wm_hints_mask = None; window->wm_hints_urgent = FALSE; @@ -12052,3 +12079,25 @@ return TRUE; } + +/** + * meta_window_get_icon_name: + * @window: a #MetaWindow + * + * Returns the currently set icon name or icon path for the window. + * + * Note: + * + * This will currently only be non-NULL for programs that use XAppGtkWindow + * in place of GtkWindow and use xapp_gtk_window_set_icon_name() or + * set_icon_from_file(). These methods will need to be used explicitly in + * C programs, but for introspection use you should not need to treat it any + * differently (except for using the correct window class.) + */ +const char * +meta_window_get_icon_name (MetaWindow *window) +{ + g_return_val_if_fail (META_IS_WINDOW (window), NULL); + + return window->theme_icon_name; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/core/xprops.c new/muffin-3.6.0/src/core/xprops.c --- old/muffin-3.4.1/src/core/xprops.c 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/core/xprops.c 2017-10-24 11:21:07.000000000 +0200 @@ -873,7 +873,11 @@ return FALSE; if (results->n_items < OldNumPropSizeElements) - return FALSE; + { + XFree (results->prop); + results->prop = NULL; + return FALSE; + } raw = (xPropSizeHints*) results->prop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/meta/atomnames.h new/muffin-3.6.0/src/meta/atomnames.h --- old/muffin-3.4.1/src/meta/atomnames.h 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/meta/atomnames.h 2017-10-24 11:21:07.000000000 +0200 @@ -177,6 +177,9 @@ item(_NET_WM_BYPASS_COMPOSITOR) item(_NET_WM_FRAME_DRAWN) item(_NET_WM_FRAME_TIMINGS) +item(_NET_WM_XAPP_ICON_NAME) +item(_NET_WM_XAPP_PROGRESS) +item(_NET_WM_XAPP_PROGRESS_PULSE) #if 0 /* We apparently never use: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-3.4.1/src/meta/window.h new/muffin-3.6.0/src/meta/window.h --- old/muffin-3.4.1/src/meta/window.h 2017-08-08 13:15:34.000000000 +0200 +++ new/muffin-3.6.0/src/meta/window.h 2017-10-24 11:21:07.000000000 +0200 @@ -186,5 +186,5 @@ gboolean meta_window_can_tile (MetaWindow *window, MetaTileMode mode); gboolean meta_window_tile (MetaWindow *window, MetaTileMode mode, gboolean snap); - +const char *meta_window_get_icon_name (MetaWindow *window); #endif
