[mate-panel] 03/07: debian/patches: Add 0000_add_gsettings_key_to_enable_sni.patch.
Mike Gabriel
sunweaver at debian.org
Tue Jul 25 09:49:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository mate-panel.
commit 22d3e9a166bbd494db183e5b3cdeff094003b293
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date: Sat Jul 15 12:35:17 2017 +0100
debian/patches: Add 0000_add_gsettings_key_to_enable_sni.patch.
---
.../0000_add_gsettings_key_to_enable_sni.patch | 58 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 59 insertions(+)
diff --git a/debian/patches/0000_add_gsettings_key_to_enable_sni.patch b/debian/patches/0000_add_gsettings_key_to_enable_sni.patch
new file mode 100644
index 0000000..c9f09f9
--- /dev/null
+++ b/debian/patches/0000_add_gsettings_key_to_enable_sni.patch
@@ -0,0 +1,58 @@
+From b0a4cb897cd509fcff2561ac66b9dc9a74c9b85b Mon Sep 17 00:00:00 2001
+From: Clement Lefebvre <clement.lefebvre at linuxmint.com>
+Date: Tue, 27 Jun 2017 16:09:17 +0200
+Subject: [PATCH] Add a gsettings key to enable/disable SNI Support
+
+---
+ applets/notification_area/main.c | 19 +++++++++++++------
+ data/org.mate.panel.gschema.xml.in | 5 +++++
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
+index f4de7d01..9e489932 100644
+--- a/applets/notification_area/main.c
++++ b/applets/notification_area/main.c
+@@ -64,15 +64,22 @@ static GfStatusNotifierWatcher *sn_watcher_service = NULL;
+ static GfStatusNotifierWatcher *
+ sn_watcher_service_ref (void)
+ {
+- if (sn_watcher_service != NULL)
+- g_object_ref (sn_watcher_service);
+- else
++ GSettings *settings;
++ settings = g_settings_new ("org.mate.panel");
++
++ if (g_settings_get_boolean (settings, "enable-sni-support") == TRUE)
+ {
+- sn_watcher_service = gf_status_notifier_watcher_new ();
+- g_object_add_weak_pointer ((GObject *) sn_watcher_service,
+- (gpointer *) &sn_watcher_service);
++ if (sn_watcher_service != NULL)
++ g_object_ref (sn_watcher_service);
++ else
++ {
++ sn_watcher_service = gf_status_notifier_watcher_new ();
++ g_object_add_weak_pointer ((GObject *) sn_watcher_service,
++ (gpointer *) &sn_watcher_service);
++ }
+ }
+
++ g_object_unref (settings);
+ return sn_watcher_service;
+ }
+ #endif
+diff --git a/data/org.mate.panel.gschema.xml.in b/data/org.mate.panel.gschema.xml.in
+index 9c6fdb8c..8149db81 100644
+--- a/data/org.mate.panel.gschema.xml.in
++++ b/data/org.mate.panel.gschema.xml.in
+@@ -84,5 +84,10 @@
+ <summary>Disable Force Quit</summary>
+ <description>If true, the panel will not allow a user to force an application to quit by removing access to the force quit button.</description>
+ </key>
++ <key name="enable-sni-support" type="b">
++ <default>true</default>
++ <summary>Enable SNI support</summary>
++ <description>If true, the panel provides support for SNI.</description>
++ </key>
+ </schema>
+ </schemalist>
diff --git a/debian/patches/series b/debian/patches/series
index c730719..13cadd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001_memleak-fix.patch
1000_prevent_menubar_destruction_when_enabling_global_menus.patch
+0000_add_gsettings_key_to_enable_sni.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git
More information about the pkg-mate-commits
mailing list