[mate-netbook] 01/10: Add 0001_preserve_configuration.patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-netbook.

commit fc8a6ac5da5a9da1d11320b36eb802aed3030fae
Author: Martin Wimpress <code at flexion.org>
Date:   Tue May 19 16:25:27 2015 +0100

    Add 0001_preserve_configuration.patch.
---
 debian/changelog                                 |  9 ++++
 debian/patches/0001_preserve_configuration.patch | 59 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 032d561..6465118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mate-netbook (1.8.2-2~vivid1) vivid; urgency=medium
+
+  * Upload to unstable.
+  * debian/patches:
+    + Add 0002_preserve_configuration.patch. Ensure Window Picker
+      applet doesn't override mate-maximus. (Closes: #785090).
+
+ -- Martin Wimpress <code at flexion.org>  Tue, 19 May 2015 01:48:35 +0100
+
 mate-netbook (1.8.2-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0001_preserve_configuration.patch b/debian/patches/0001_preserve_configuration.patch
new file mode 100644
index 0000000..e30bd70
--- /dev/null
+++ b/debian/patches/0001_preserve_configuration.patch
@@ -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 <monsta at inbox.ru>
+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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7d46caf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_preserve_configuration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-netbook.git