Merge branch 'master' into ext-perl

[chaz/homebank] / src / hb-preferences.c

diff --git a/src/hb-preferences.c b/src/hb-preferences.c
index 7933e34f6ec50d2b68f4fa5ec7a1e5fb85433a26..ec6ce1595a151a544bbf07aa6b8ba2361ed4dfe7 100644 (file)
--- a/src/hb-preferences.c
+++ b/src/hb-preferences.c
@@ -295,6 +295,9 @@ void homebank_pref_free(void)
        g_free(PREFS->minor_cur.decimal_char);
        g_free(PREFS->minor_cur.grouping_char);
 
+       g_strfreev(PREFS->ext_path);
+       g_list_free_full(PREFS->ext_whitelist, g_free);
+
        memset(PREFS, 0, sizeof(struct Preferences));
 }
 
@@ -447,6 +450,23 @@ gint i;
        PREFS->vehicle_unit_ismile = FALSE;
        PREFS->vehicle_unit_isgal  = FALSE;
 
+       gchar** plugin_path = g_new0(gchar*, 4);
+       i = 0;
+       const gchar* env = g_getenv("HOMEBANK_PLUGINS");
+       if (env) {
+               if (g_path_is_absolute(env)) {
+                       plugin_path[i++] = g_strdup(env);
+               } else {
+                       gchar* cur = g_get_current_dir();
+                       plugin_path[i++] = g_build_filename(cur, env, NULL);
+                       g_free(cur);
+               }
+       }
+       plugin_path[i++] = g_build_filename(homebank_app_get_config_dir(), "plugins", NULL);
+       plugin_path[i++] = g_build_filename(homebank_app_get_pkglib_dir(), "plugins", NULL);
+       PREFS->ext_path = plugin_path;
+       PREFS->ext_whitelist = NULL;
+
        _homebank_pref_init_measurement_units();
 
 }
@@ -981,6 +1001,27 @@ GError *error = NULL;
                        //PREFS->chart_legend = g_key_file_get_boolean (keyfile, group, "Legend", NULL);
 
 
+                       group = "Plugins";
+                       {
+                               DB( g_print(" -> ** Plugins\n") );
+
+                               gchar** strv = g_key_file_get_string_list(keyfile, group, "Path", NULL, NULL);
+                               if (strv) {
+                                       g_strfreev(PREFS->ext_path);
+                                       PREFS->ext_path = strv;
+                               }
+
+                               strv = g_key_file_get_string_list(keyfile, group, "Whitelist", NULL, NULL);
+                               if (strv) {
+                                       gchar** it;
+                                       for (it = strv; it && *it; ++it) {
+                                               PREFS->ext_whitelist = g_list_append(PREFS->ext_whitelist, g_strdup(*it));
+                                       }
+                                       g_strfreev(strv);
+                               }
+                       }
+
+
                        /*
                        #if MYDEBUG == 1
                        gsize length;
@@ -1177,6 +1218,21 @@ GError *error = NULL;
                //group = "Chart";
                //g_key_file_set_boolean (keyfile, group, "Legend", PREFS->chart_legend);
 
+               group = "Plugins";
+               {
+                       g_key_file_set_string_list(keyfile, group, "Path", (const gchar* const*)PREFS->ext_path, g_strv_length(PREFS->ext_path));
+
+                       gsize len = g_list_length(PREFS->ext_whitelist);
+                       gchar** strv = g_new0(gchar*, len + 1);
+                       guint i;
+
+                       for (i = 0; i < len; ++i) {
+                               strv[i] = g_list_nth_data(PREFS->ext_whitelist, i);
+                       }
+                       g_key_file_set_string_list(keyfile, group, "Whitelist", (const gchar* const*)strv, len);
+                       g_free(strv);
+               }
+
                //g_key_file_set_string  (keyfile, group, "", PREFS->);
                //g_key_file_set_boolean (keyfile, group, "", PREFS->);
                //g_key_file_set_integer (keyfile, group, "", PREFS->);