From 4a25da504204639cee268d0fac1516f03d2fe6bb Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Wed, 16 Aug 2017 02:30:35 +0200 Subject: Add a gsettings key to enable/disable SNI Support (#600) --- 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 6818ce5e..46d8ea48 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 @@ Disable Force Quit If true, the panel will not allow a user to force an application to quit by removing access to the force quit button. + + true + Enable SNI support + If true, the panel provides support for SNI. + -- cgit v1.2.1