better backward compatibility

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 8ba2c08f9602d583c8f12f49e7fea29e0ea82ef3..d75ba209a5c742a5ae0652603b659c2489026e5d 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -466,15 +466,36 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "taskbar_name") == 0) {
                taskbarname_enabled = atoi (value);
        }
+       else if (strcmp (key, "taskbar_name_padding") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               panel_config.g_taskbar.area_name.paddingxlr = panel_config.g_taskbar.area_name.paddingx = atoi (value1);
+       }
        else if (strcmp (key, "taskbar_name_background_id") == 0) {
+               int id = atoi (value);
+               id = (id < backgrounds->len && id >= 0) ? id : 0;
+               panel_config.g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] == 0)
+                       panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = panel_config.g_taskbar.background_name[TASKBAR_NORMAL];
        }
        else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
+               int id = atoi (value);
+               id = (id < backgrounds->len && id >= 0) ? id : 0;
+               panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
        }
        else if (strcmp (key, "taskbar_name_font") == 0) {
+               taskbarname_font_desc = pango_font_description_from_string (value);
        }
        else if (strcmp (key, "taskbar_name_font_color") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               get_color (value1, taskbarname_font.color);
+               if (value2) taskbarname_font.alpha = (atoi (value2) / 100.0);
+               else taskbarname_font.alpha = 0.5;
        }
        else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               get_color (value1, taskbarname_active_font.color);
+               if (value2) taskbarname_active_font.alpha = (atoi (value2) / 100.0);
+               else taskbarname_active_font.alpha = 0.5;
        }
 
        /* Task */
@@ -539,6 +560,15 @@ void add_entry (char *key, char *value)
 
        /* Systray */
        else if (strcmp (key, "systray_padding") == 0) {
+               if (new_config_file == 0) {
+                       if (panel_items_order) {
+                               char* tmp = g_strconcat(panel_items_order, "S", NULL);
+                               g_free( panel_items_order );
+                               panel_items_order = tmp;
+                       }
+                       else
+                               panel_items_order = g_strdup("S");
+               }
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);