fixed issue 309

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index d75ba209a5c742a5ae0652603b659c2489026e5d..2224a1d3e30449e34becb982835c50ec1be15eb5 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -257,7 +257,7 @@ void add_entry (char *key, char *value)
                                if (snapshot_path == 0)
                                        systray_enabled = 1;
                        }
-                       if (panel_items_order[j] == 'C')                        
+                       if (panel_items_order[j] == 'C')
                                clock_enabled = 1;
                }
        }
@@ -557,10 +557,14 @@ void add_entry (char *key, char *value)
                panel_config.g_task.config_background_mask |= (1<<status);
                if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
        }
+       // "tooltip" is deprecated but here for backwards compatibility
+       else if (strcmp (key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0)
+               panel_config.g_task.tooltip_enabled = atoi(value);
 
        /* Systray */
        else if (strcmp (key, "systray_padding") == 0) {
-               if (new_config_file == 0) {
+               if (new_config_file == 0 && systray_enabled == 0) {
+                       systray_enabled = 1;
                        if (panel_items_order) {
                                char* tmp = g_strconcat(panel_items_order, "S", NULL);
                                g_free( panel_items_order );
@@ -625,8 +629,6 @@ void add_entry (char *key, char *value)
        }
 
        /* Tooltip */
-       else if (strcmp (key, "tooltip") == 0)
-               g_tooltip.enabled = atoi(value);
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
                int timeout_msec = 1000*atof(value);
                g_tooltip.show_timeout_msec = timeout_msec;