diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-08-01 19:50:36 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-08-01 19:50:36 +0200 |
| commit | 4c5ff3be906189395060d9cd22c74e9131c1bcae (patch) | |
| tree | 1892d0d14680bb6a1283a3fc41be90a1e799c541 /src | |
| parent | cc71bb21e3444e1667553c545da2044482a31f18 (diff) | |
| parent | 00106830b59aeeeba5027bf039acf24d6786b77f (diff) | |
Merge main -> GROWS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/IO/http.c | 2 | ||||
| -rw-r--r-- | src/uicmd.cc | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/IO/http.c b/src/IO/http.c index 8c7dcef1..68294fb4 100644 --- a/src/IO/http.c +++ b/src/IO/http.c @@ -584,7 +584,7 @@ static void Http_dns_cb(int Status, Dlist *addr_list, void *data) Http_connect_queued_sockets(hc); } else { /* DNS wasn't able to resolve the hostname */ - MSG_BW(S->web, 0, "ERROR: Dns can't resolve %s", + MSG_BW(S->web, 0, "ERROR: DNS can't resolve %s", (S->flags & HTTP_SOCKET_USE_PROXY) ? URL_HOST_(HTTP_Proxy) : URL_HOST_(S->web->url)); a_Chain_bfcb(OpAbort, S->Info, NULL, "Both"); diff --git a/src/uicmd.cc b/src/uicmd.cc index 4f737255..fa39627f 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -433,7 +433,9 @@ void CustTabs::switch_tab(CustTabButton *cbtn) // Update window title if ((bw = a_UIcmd_get_bw_by_widget(cbtn->ui()))) { const char *title = (cbtn->ui())->label(); - cbtn->window()->copy_label(title ? title : ""); + Fl_Window *win = cbtn->window(); + win->copy_label(title ? title : ""); + win->iconlabel(win->label()); } // Update focus priority increase_focus_counter(); @@ -605,8 +607,11 @@ static BrowserWindow *UIcmd_tab_new(CustTabs *tabs, UI *old_ui, int focus) new_bw->render_layout = (void*)layout; // Clear the window title - if (focus) - new_ui->window()->copy_label(new_ui->label()); + if (focus) { + Fl_Window *win = new_ui->window(); + win->copy_label(new_ui->label()); + win->iconlabel(win->label()); + } // WORKAROUND: see findbar_toggle() new_ui->findbar_toggle(0); @@ -1413,7 +1418,9 @@ void a_UIcmd_set_page_title(BrowserWindow *bw, const char *label) if (a_UIcmd_get_bw_by_widget(BW2UI(bw)->tabs()->wizard()->value()) == bw) { // This is the focused bw, set window title - BW2UI(bw)->window()->copy_label(title); + Fl_Window *win = BW2UI(bw)->window(); + win->copy_label(title); + win->iconlabel(win->label()); } } |