diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2019-07-15 23:23:21 +0200 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2019-07-16 19:56:45 +0200 |
| commit | 6e9c6ef3f1a291810b79aec6449219022c206a9d (patch) | |
| tree | e02ab3522696b254a82f783ac0eebb4321be76c4 | |
| parent | b08b7b3a2075de5ff9776ee22922deba75605fff (diff) | |
| download | ixfce4-power-manager-6e9c6ef3f1a291810b79aec6449219022c206a9d.tar.gz | |
Disable trayicon when panel plugin is present (Bug #15682)
| -rw-r--r-- | panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c | 10 |
1 files changed, 9 insertions, 1 deletions
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 2b5db53e..994d9fdc 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; } |