add missing battery config CPP guard

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index bf86b10e4b942328186ae325c701c8665b1998ff..f08bcaefb60d70aca49cb24425a6c434843e91cc 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -484,6 +484,14 @@ void add_entry (char *key, char *value)
                if (value2) panel_config.g_task.area.paddingy = atoi (value2);
                if (value3) panel_config.g_task.area.paddingx = atoi (value3);
        }
+       else if (strcmp (key, "task_align") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               printf("task_align: %s\n", value1);
+               if (strcmp (value1, "left") == 0) panel_config.g_task.align = ALIGN_LEFT;
+               else if (strcmp (value1, "center") == 0) panel_config.g_task.align = ALIGN_CENTER;
+               else if (strcmp (value1, "right") == 0) panel_config.g_task.align = ALIGN_RIGHT;
+               else fprintf(stderr, "Unknown value for task_align: %s\n", value1);
+       }
        else if (strcmp (key, "task_font") == 0) {
                panel_config.g_task.font_desc = pango_font_description_from_string (value);
        }
@@ -583,6 +591,18 @@ void add_entry (char *key, char *value)
                char *app = strdup(value);
                panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
        }
+       else if (strcmp(key, "launcher_apps_dir") == 0) {
+
+               GList *list = dir_scan_alpha(value, "*.desktop");
+
+               for (list = g_list_first(list); list; list = g_list_next(list)) {
+                       fprintf(stderr, "Add launcher app: %s\n", (const char *)list->data);
+                       panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, (char *)strdup((const char *)list->data));
+               }
+
+               // Cleanup
+               g_list_free_full(list, g_free);
+       }
        else if (strcmp(key, "launcher_icon_theme") == 0) {
                // if XSETTINGS manager running, tint2 use it.
                if (!icon_theme_name)
@@ -675,6 +695,7 @@ void add_entry (char *key, char *value)
                        }
                }
        }
+#ifdef ENABLE_BATTERY
        else if (strcmp(key, "battery") == 0) {
                if (new_config_file == 0) {
                        battery_enabled = atoi(value);
@@ -689,6 +710,7 @@ void add_entry (char *key, char *value)
                        }
                }
        }
+#endif
        else
                fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);