Package: release.debian.org Severity: normal Tags: jessie User: [email protected] Usertags: pu
+ * Add 0002_preserve_configuration.patch. Ensure Window Picker + applet doesn't override mate-maximus. (Closes: #785090). -> Basically, applet A should not mess with settings of applet B. Especially not, if the user cannot do anything about it. Please accept this change as a jessie-pu. Thanks. light+love, Mike -- System Information: Debian Release: 8.0 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru mate-netbook-1.8.1/debian/changelog mate-netbook-1.8.1/debian/changelog --- mate-netbook-1.8.1/debian/changelog 2015-03-05 08:38:20.000000000 +0100 +++ mate-netbook-1.8.1/debian/changelog 2015-05-21 10:28:32.000000000 +0200 @@ -1,3 +1,11 @@ +mate-netbook (1.8.1-4+deb8u1) jessie-proposed-updates; urgency=medium + + [ Martin Wimpress ] + * Add 0002_preserve_configuration.patch. Ensure Window Picker + applet doesn't override mate-maximus. (Closes: #785090). + + -- Mike Gabriel <[email protected]> Thu, 21 May 2015 10:26:53 +0200 + mate-netbook (1.8.1-4) unstable; urgency=medium [ Martin Wimpress ] diff -Nru mate-netbook-1.8.1/debian/patches/0002_preserve_configuration.patch mate-netbook-1.8.1/debian/patches/0002_preserve_configuration.patch --- mate-netbook-1.8.1/debian/patches/0002_preserve_configuration.patch 1970-01-01 01:00:00.000000000 +0100 +++ mate-netbook-1.8.1/debian/patches/0002_preserve_configuration.patch 2015-05-21 10:24:13.000000000 +0200 @@ -0,0 +1,59 @@ + GNU nano 2.2.6 File: ../mate-netbook-181/debian/patches/0002_preserve_configuration.patch +From b84fe12fad7717ddfad5cb3bd12090f61864e759 Mon Sep 17 00:00:00 2001 +From: Monsta <[email protected]> +Date: Tue, 28 Apr 2015 16:56:54 +0300 +Subject: [PATCH] window picker applet: don't mess with maximus settings + +--- + mate-window-picker-applet/applet.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/mate-window-picker-applet/applet.c b/mate-window-picker-applet/applet.c +index 3985383..3cd9c7a 100644 +--- a/mate-window-picker-applet/applet.c ++++ b/mate-window-picker-applet/applet.c +@@ -47,10 +47,6 @@ + #define APPLET_SCHEMA "org.mate.panel.applet.mate-window-picker-applet" + #define SHOW_WIN_KEY "show-all-windows" + +-#define MAXIMUS_SCHEMA "org.mate.maximus" +-#define UNDECORATE_KEY "undecorate" +-#define NO_MAXIMIZE_KEY "no-maximize" +- + typedef struct + { + GtkWidget *tasks; +@@ -133,13 +129,6 @@ force_no_focus_padding (GtkWidget *widget) + static void + cw_applet_finalize (GObject *object) + { +- /* disable Maximus */ +- GSettings *maximus_settings; +- maximus_settings = g_settings_new (MAXIMUS_SCHEMA); +- g_settings_set_boolean (maximus_settings, UNDECORATE_KEY, FALSE); +- g_settings_set_boolean (maximus_settings, NO_MAXIMIZE_KEY, TRUE); +- g_object_unref (maximus_settings); +- + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); + } +@@ -169,18 +158,10 @@ cw_applet_fill (MatePanelApplet *applet, + mainapp = app; + screen = wnck_screen_get_default (); + +- /* prepare to disable Maximus */ + object_class = G_OBJECT_GET_CLASS (G_OBJECT(applet)); + object_class->finalize = cw_applet_finalize; + parent_class = g_type_class_peek_parent (object_class); + +- /* enable Maximus */ +- GSettings *maximus_settings; +- maximus_settings = g_settings_new (MAXIMUS_SCHEMA); +- g_settings_set_boolean (maximus_settings, UNDECORATE_KEY, TRUE); +- g_settings_set_boolean (maximus_settings, NO_MAXIMIZE_KEY, FALSE); +- g_object_unref (maximus_settings); +- + /* gsettings prefs */ + app->settings = mate_panel_applet_settings_new (applet, APPLET_SCHEMA); + g_signal_connect (app->settings, "changed::" SHOW_WIN_KEY, + diff -Nru mate-netbook-1.8.1/debian/patches/series mate-netbook-1.8.1/debian/patches/series --- mate-netbook-1.8.1/debian/patches/series 2015-03-05 08:32:59.000000000 +0100 +++ mate-netbook-1.8.1/debian/patches/series 2015-05-21 10:26:28.000000000 +0200 @@ -1 +1,2 @@ 0001_respect_undecorate_setting.patch +0002_preserve_configuration.patch
