desktop name: first step

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index d2b341481e6ca9a6c1fa90772dc9c3f3b82a7bbf..b0b06d70a262d23cc4444310270a3f09de3a244e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -3,7 +3,7 @@
 * Tint2 : read/write config file
 *
 * Copyright (C) 2007 Pål Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -457,7 +457,6 @@ void add_entry (char *key, char *value)
                panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
                if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
                        panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
-               //panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
        }
        else if (strcmp (key, "taskbar_active_background_id") == 0) {
                int id = atoi (value);
@@ -468,12 +467,23 @@ void add_entry (char *key, char *value)
                taskbarname_enabled = atoi (value);
        }
        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_ACTIVE] = &g_array_index(backgrounds, Background, id);
        }
        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) {
        }
@@ -590,8 +600,9 @@ void add_entry (char *key, char *value)
                panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
        }
        else if (strcmp(key, "launcher_icon_theme") == 0) {
-               char *app = strdup(value);
-               panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app);
+               // if XSETTINGS manager running, tint2 use it.
+               if (!icon_theme_name)
+                       icon_theme_name = strdup(value);
        }
 
        /* Tooltip */