[Xfce4-commits] [panel-plugins/xfce4-battery-plugin] 01/01: Initially show/hide widgets according to user config (bug #9594)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

l   a   n   d   r   y       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-battery-plugin.

commit 93de5176fe7d159d6060b6839358c3df6abfaa00
Author: John Lindgren <john at jlindgren.net>
Date:   Sun Nov 25 21:09:47 2018 -0500

    Initially show/hide widgets according to user config (bug #9594)
    
    - Move setup_battmon() after battmon_read_config()
    - Move gtk_widget_hide() after gtk_widget_show_all()
    - Remove redundant gtk_widget_show()
---
 panel-plugin/battery.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 4a87f9d..1fb5e91 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -691,8 +691,6 @@ static void setup_battmon(t_battmon *battmon)
     xfce_panel_image_set_size(XFCE_PANEL_IMAGE(battmon->image), size);
 
     gtk_box_pack_start(GTK_BOX(battmon->ebox),GTK_WIDGET(battmon->image), FALSE, FALSE, 0);
-    /* init hide the widget */
-    gtk_widget_hide(battmon->image);
 
     gtk_box_pack_start(GTK_BOX(battmon->ebox),GTK_WIDGET(battmon->battstatus), FALSE, FALSE, 0);
 
@@ -737,6 +735,8 @@ static void setup_battmon(t_battmon *battmon)
         gtk_widget_hide(GTK_WIDGET(battmon->battstatus));
     if(!battmon->options.display_label)
         gtk_widget_hide(GTK_WIDGET(battmon->label));
+    if(!battmon->options.display_icon)
+        gtk_widget_hide(battmon->image);
     if(!battmon->options.display_power){
         gtk_widget_hide(GTK_WIDGET(battmon->acfan));
         gtk_widget_hide(GTK_WIDGET(battmon->temp));
@@ -751,7 +751,6 @@ static void setup_battmon(t_battmon *battmon)
     if (!battmon->options.display_time && !battmon->options.display_percentage) {
         gtk_widget_hide(GTK_WIDGET(battmon->timechargealignment));
     }
-    gtk_widget_show(battmon->ebox);
 
     gtk_widget_set_size_request(battmon->ebox, -1, -1);
 }
@@ -807,8 +806,6 @@ battmon_create(XfcePanelPlugin *plugin)
     battmon->low = FALSE;
     battmon->critical = FALSE;
 
-    setup_battmon(battmon);
-
     battmon->timeoutid = 0;
     battmon->flag = FALSE;
 
@@ -1584,6 +1581,8 @@ battmon_construct (XfcePanelPlugin *plugin)
 
     battmon_read_config (plugin, battmon);
 
+    setup_battmon (battmon);
+
     g_signal_connect (plugin, "free-data", G_CALLBACK (battmon_free), battmon);
 
     g_signal_connect (plugin, "save", G_CALLBACK (battmon_write_config), battmon);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.