[mate-netbook] 04/10: debian/patches/0001_preserve_configuration.patch. Applied upstream.

[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 a5dc9c314ec7d620d72d921b7ec425a4198e658e
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Jun 16 16:12:17 2015 +0100

    debian/patches/0001_preserve_configuration.patch. Applied upstream.
---
 debian/patches/0001_preserve_configuration.patch | 59 ------------------------
 1 file changed, 59 deletions(-)

diff --git a/debian/patches/0001_preserve_configuration.patch b/debian/patches/0001_preserve_configuration.patch
deleted file mode 100644
index e30bd70..0000000
--- a/debian/patches/0001_preserve_configuration.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-  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,
-

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