diff options
| author | Jorge Arellano Cid <jcid@dillo.org> | 2011-07-24 13:47:24 -0400 |
|---|---|---|
| committer | Jorge Arellano Cid <jcid@dillo.org> | 2011-07-24 13:47:24 -0400 |
| commit | 378a4098e362794b4feb3d75e40b6ada697c47e9 (patch) | |
| tree | a0e7e1dd5ed6790227e0f98cf7e17021cb089277 /src/prefsparser.cc | |
| parent | 58d8a78e4c89ba7609cb16ba8b4462235137fd58 (diff) | |
Added multiple search engines (with several 'search_url' lines in dillorc)
This patch adds the PREFS_STRINGS type to the prefsparser, which allows having
multiple different strings asociated with one dillorc option (stored in a list)
Diffstat (limited to 'src/prefsparser.cc')
| -rw-r--r-- | src/prefsparser.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/prefsparser.cc b/src/prefsparser.cc index 9d245706..bf973225 100644 --- a/src/prefsparser.cc +++ b/src/prefsparser.cc @@ -24,6 +24,7 @@ typedef enum { PREFS_BOOL, PREFS_COLOR, PREFS_STRING, + PREFS_STRINGS, PREFS_URL, PREFS_INT32, PREFS_DOUBLE, @@ -86,7 +87,7 @@ int PrefsParser::parseOption(char *name, char *value) { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE }, { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL }, { "save_dir", &prefs.save_dir, PREFS_STRING }, - { "search_url", &prefs.search_url, PREFS_STRING }, + { "search_url", &prefs.search_urls, PREFS_STRINGS }, { "show_back", &prefs.show_back, PREFS_BOOL }, { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL }, { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL }, @@ -134,6 +135,19 @@ int PrefsParser::parseOption(char *name, char *value) dFree(*(char **)node->pref); *(char **)node->pref = dStrdup(value); break; + case PREFS_STRINGS: + { + Dlist *lp = *(Dlist **)node->pref; + if (dList_length(lp) == 2 && !dList_nth_data(lp, 1)) { + /* override the default */ + void *data = dList_nth_data(lp, 0); + dList_remove(lp, data); + dList_remove(lp, NULL); + dFree(data); + } + dList_append(lp, dStrdup(value)); + break; + } case PREFS_URL: a_Url_free(*(DilloUrl **)node->pref); *(DilloUrl **)node->pref = a_Url_new(value, NULL); |