diff options
author | corvid <corvid@lavabit.com> | 2012-12-31 20:49:32 +0000 |
---|---|---|
committer | corvid <corvid@lavabit.com> | 2012-12-31 20:49:32 +0000 |
commit | 07f12d12a67d844f35292deb299c6782793dde5d (patch) | |
tree | 3322e3df973c81a73418f4ab443b02d872ff86a8 | |
parent | 68f17afdc211dd81da838f576dbe2eeb0f026baf (diff) |
rm show_url preference
It hasn't worked for a long time, no one seems to miss it, and there isn't
any compelling case for making the effort to make it work.
http://lists.auriga.wearlab.de/pipermail/dillo-dev/2012-December/009704.html
-rw-r--r-- | dillorc | 1 | ||||
-rw-r--r-- | src/prefs.c | 1 | ||||
-rw-r--r-- | src/prefs.h | 1 | ||||
-rw-r--r-- | src/prefsparser.cc | 6 | ||||
-rw-r--r-- | src/ui.cc | 2 |
5 files changed, 0 insertions, 11 deletions
@@ -259,7 +259,6 @@ search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s" #show_tools=YES #show_filemenu=YES #show_clear_url=YES -#show_url=YES #show_search=YES #show_help=YES #show_progress_box=YES diff --git a/src/prefs.c b/src/prefs.c index 4ec95144..3ad65832 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -96,7 +96,6 @@ void a_Prefs_init(void) prefs.show_stop = TRUE; prefs.show_tools = TRUE; prefs.show_tooltip = TRUE; - prefs.show_url = TRUE; prefs.small_icons = FALSE; prefs.start_page = a_Url_new(PREFS_START_PAGE, NULL); prefs.theme = dStrdup(PREFS_THEME); diff --git a/src/prefs.h b/src/prefs.h index 074c8bd5..22af91fd 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -68,7 +68,6 @@ struct _DilloPrefs { bool_t show_tools; bool_t show_filemenu; bool_t show_clear_url; - bool_t show_url; bool_t show_search; bool_t show_help; bool_t show_progress_box; diff --git a/src/prefsparser.cc b/src/prefsparser.cc index cf4c50f7..eef93ea1 100644 --- a/src/prefsparser.cc +++ b/src/prefsparser.cc @@ -106,7 +106,6 @@ int PrefsParser::parseOption(char *name, char *value) { "show_stop", &prefs.show_stop, PREFS_BOOL }, { "show_tools", &prefs.show_tools, PREFS_BOOL }, { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL }, - { "show_url", &prefs.show_url, PREFS_BOOL }, { "small_icons", &prefs.small_icons, PREFS_BOOL }, { "start_page", &prefs.start_page, PREFS_URL }, { "theme", &prefs.theme, PREFS_STRING }, @@ -237,9 +236,4 @@ void PrefsParser::parse(FILE *fp) // restore the old numeric locale setlocale(LC_NUMERIC, oldLocale); dFree(oldLocale); - - if (!prefs.show_url) { - MSG_WARN("Reenabling show_url preference (UI requires it currently).\n"); - prefs.show_url = true; - } } @@ -947,8 +947,6 @@ void UI::customize(int flags) Tools->hide(); if ( !prefs.show_clear_url ) Clear->hide(); - if ( !prefs.show_url ) - Location->hide(); if ( !prefs.show_search ) Search->hide(); if ( !prefs.show_help ) |