From 7ef55025f252225671c4fd23918561512a685e33 Mon Sep 17 00:00:00 2001 From: portix Date: Sat, 25 Jun 2011 22:51:36 +0200 Subject: Load dwb uri --- src/dwb.c | 7 +++++-- src/html.c | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dwb.c b/src/dwb.c index 2253e98c..1a7e1228 100644 --- a/src/dwb.c +++ b/src/dwb.c @@ -1724,6 +1724,7 @@ dwb_load_uri(GList *gl, Arg *arg) { if (!arg || !arg->p || !strlen(arg->p)) { return; } + /* new window ? */ if (dwb.state.nv == OPEN_NEW_WINDOW) { dwb.state.nv = OPEN_NORMAL; @@ -1840,11 +1841,13 @@ dwb_load_uri(GList *gl, Arg *arg) { } } } - else if (g_str_has_prefix(arg->p, "dwb://") && dwb_html_load(web, arg->p)) { + else if (g_str_has_prefix(arg->p, "dwb://")) { + webkit_web_view_load_uri(web, arg->p); return; } /* Check if searchengine is needed and load uri */ - else if ( !(uri = dwb_get_search_engine(arg->p)) || strstr(arg->p, "localhost:")) { + + else if (!(uri = dwb_get_search_engine(arg->p)) || strstr(arg->p, "localhost:")) { uri = g_str_has_prefix(arg->p, "http://") || g_str_has_prefix(arg->p, "https://") ? g_strdup(arg->p) : g_strdup_printf("http://%s", (char*)arg->p); diff --git a/src/html.c b/src/html.c index 94b8b499..4f7bba6a 100644 --- a/src/html.c +++ b/src/html.c @@ -123,7 +123,6 @@ dwb_html_keys(WebKitWebView *wv, HtmlTable *table) { ", i, n.second, n.first, n.first, n.first, dwb_modmask_to_string(km->mod), km->key ? km->key : ""); } - PRINT_DEBUG("%s", buffer->str); g_signal_connect(wv, "notify::load-status", G_CALLBACK(dwb_html_keys_load_cb), table); dwb_html_load_page(wv, table, buffer->str); g_string_free(buffer, true); -- cgit v1.2.3