cleanup default value on SIGUSR1

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 150face8b7f172eac0b7536f94dc4c951419a445..30aa6e122f700d614d63b93501ddb58f2f9768aa 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -73,6 +73,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();
@@ -527,12 +528,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 +627,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);