From 6febba29b0f0eb8acc00b254cd14daa28efba1b6 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Mon, 15 Jul 2019 23:23:21 +0200 Subject: [PATCH] Disable the trayicon when the panel plugin is present (Bug #15682) --- .../xfce/xfce-power-manager-plugin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c index 2b5db53..994d9fd 100644 --- a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c +++ b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c @@ -223,6 +223,7 @@ static PowerManagerPlugin * power_manager_plugin_new (XfcePanelPlugin *plugin) { PowerManagerPlugin *power_manager_plugin; + XfconfChannel *channel; /* allocate memory for the plugin structure */ power_manager_plugin = panel_slice_new0 (PowerManagerPlugin); @@ -237,7 +238,14 @@ power_manager_plugin_new (XfcePanelPlugin *plugin) power_manager_plugin->power_manager_button = power_manager_button_new (plugin); gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button); - power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button)); + power_manager_button_show (POWER_MANAGER_BUTTON (power_manager_plugin->power_manager_button)); + + /* disable the systray item when the plugin is started, allowing the user to + later manually enable it, e.g. for testing purposes. */ + channel = xfconf_channel_get (XFPM_CHANNEL); + if (xfconf_channel_get_bool (channel, "/xfce4-power-manager/show-tray-icon", TRUE)) + g_warning ("Xfce4-power-manager: The panel plugin is present, so the tray icon gets disabled."); + xfconf_channel_set_bool (channel, "/xfce4-power-manager/show-tray-icon", FALSE); return power_manager_plugin; } -- 2.19.1