aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2012-12-24 16:44:55 +0000
committercorvid <corvid@lavabit.com>2012-12-24 16:44:55 +0000
commit5b82fe650996097b18d6bc9fe4d78eaeb07b0609 (patch)
treea5d23361570975385bd09b5dc94e48d439f0810a
parentf40f4432c6e049179137263159f0d69ca22c105b (diff)
never leave Location blank when requesting url
-rw-r--r--src/dillo.cc5
-rw-r--r--src/uicmd.cc1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/dillo.cc b/src/dillo.cc
index 3539ad42..74233242 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -427,8 +427,10 @@ int main(int argc, char **argv)
if (dStrAsciiCasecmp(URL_SCHEME(prefs.start_page), "about") == 0 &&
strcmp(URL_PATH(prefs.start_page), "blank") == 0)
a_UIcmd_open_url(bw, NULL); // NULL URL focuses location
- else
+ else {
a_UIcmd_open_url(bw, prefs.start_page);
+ a_UIcmd_set_location_text(bw, URL_STR(prefs.start_page));
+ }
} else {
for (int i = idx; i < argc; i++) {
DilloUrl *start_url = makeStartUrl(argv[i], local);
@@ -443,6 +445,7 @@ int main(int argc, char **argv)
}
} else {
a_UIcmd_open_url(bw, start_url);
+ a_UIcmd_set_location_text(bw, URL_STR(start_url));
}
a_Url_free(start_url);
}
diff --git a/src/uicmd.cc b/src/uicmd.cc
index a5280b76..d97744ca 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -699,6 +699,7 @@ static void UIcmd_open_url_nbw(BrowserWindow *new_bw, const DilloUrl *url)
*/
if (url) {
a_Nav_push(new_bw, url, NULL);
+ a_UIcmd_set_location_text(new_bw, URL_STR(url));
BW2UI(new_bw)->focus_main();
} else {
BW2UI(new_bw)->focus_location();