moved initial values in function default_xxx

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 150face8b7f172eac0b7536f94dc4c951419a445..cc8cb5587ee50c50efe202954c0d72c3f840f08d 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -52,8 +52,8 @@
 #endif
 
 // global path
-char *config_path = 0;
-char *snapshot_path = 0;
+char *config_path;
+char *snapshot_path;
 
 // --------------------------------------------------
 // backward compatibility
@@ -63,6 +63,20 @@ static int old_task_icon_size;
 static int old_config_file;
 
 
+void default_config()
+{
+       config_path = 0;
+       snapshot_path = 0;
+       old_config_file = 1;
+}
+
+void cleanup_config()
+{
+       if (config_path) g_free(config_path);
+       if (snapshot_path) g_free(snapshot_path);
+}
+
+
 void init_config()
 {
        if (backgrounds)
@@ -73,6 +87,7 @@ void init_config()
        Background transparent_bg;
        memset(&transparent_bg, 0, sizeof(Background));
        g_array_append_val(backgrounds, transparent_bg);
+printf("*** init_config()\n");
 
        // tint2 could reload config, so we cleanup objects
        cleanup_systray();
@@ -87,9 +102,6 @@ void init_config()
                pango_font_description_free(panel_config.g_task.font_desc);
        }
        memset(&panel_config, 0, sizeof(Panel));
-       systray.alpha = 100;
-       systray.sort = 3;
-       old_config_file = 1;
 
        // window manager's menu default value == false
        wm_menu = 0;
@@ -102,11 +114,6 @@ void init_config()
 }
 
 
-void cleanup_config()
-{
-}
-
-
 void extract_values (const char *value, char **value1, char **value2, char **value3)
 {
        char *b=0, *c=0;
@@ -527,12 +534,13 @@ void add_entry (char *key, char *value)
        }
 
        /* Systray */
-       else if (strcmp (key, "systray") == 0) {
+       // systray disabled in snapshot mode
+       else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
                systray_enabled = atoi(value);
                // systray is latest option added. files without 'systray' are old.
                old_config_file = 0;
        }
-       else if (strcmp (key, "systray_padding") == 0) {
+       else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
                if (old_config_file)
                        systray_enabled = 1;
                extract_values(value, &value1, &value2, &value3);
@@ -625,7 +633,7 @@ void add_entry (char *key, char *value)
                panel_autohide_height = atoi(value);
 
        else
-               fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);
+               fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
 
        if (value1) free (value1);
        if (value2) free (value2);