diff options
| author | Josh Rickmar <jrick@devio.us> | 2012-08-22 15:07:53 -0400 |
|---|---|---|
| committer | Josh Rickmar <jrick@devio.us> | 2012-08-22 15:07:53 -0400 |
| commit | 5eb53d180ff8ce67a1c3f022cffaca31c3e84ef7 (patch) | |
| tree | 4a9daa505b043eb02c6f8daecce669b032c12de7 /xombrero.c | |
| parent | 8a26782c4467799f219764b398ecac68c0ea6251 (diff) | |
| download | xombrero-5eb53d180ff8ce67a1c3f022cffaca31c3e84ef7.tar.gz | |
Remove some deprecated signals
This stops the webview's deprecated load-finished and load-progress-changed signals from being attached to. May help with stability.
Diffstat (limited to 'xombrero.c')
| -rw-r--r-- | xombrero.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/xombrero.c b/xombrero.c index 1049c5a..2fa0ad5 100644 --- a/xombrero.c +++ b/xombrero.c @@ -4264,6 +4264,11 @@ notify_load_status_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t) if ((uri = get_uri(t)) == NULL) return; + /* autorun some js if enabled */ + js_autorun(t); + + input_autofocus(t); + if (!strncmp(uri, "http://", strlen("http://")) || !strncmp(uri, "https://", strlen("https://")) || !strncmp(uri, "file://", strlen("file://"))) { @@ -4462,22 +4467,15 @@ done: } void -webview_load_finished_cb(WebKitWebView *wv, WebKitWebFrame *wf, struct tab *t) +webview_progress_changed_cb(WebKitWebView *wv, GParamSpec *pspec, struct tab *t) { - /* autorun some js if enabled */ - js_autorun(t); + gdouble progress; - input_autofocus(t); - -} - -void -webview_progress_changed_cb(WebKitWebView *wv, int progress, struct tab *t) -{ + progress = webkit_web_view_get_progress(wv); gtk_entry_set_progress_fraction(GTK_ENTRY(t->sbe.uri), - progress == 100 ? 0 : (double)progress / 100); + progress == 1.0 ? 0 : progress); gtk_entry_set_progress_fraction(GTK_ENTRY(t->uri_entry), - progress == 100 ? 0 : (double)progress / 100); + progress == 1.0 ? 0 : progress); update_statusbar_position(NULL, NULL); } @@ -7836,8 +7834,6 @@ create_new_tab(char *title, struct undo *u, int focus, int position) "signal::create-web-view", G_CALLBACK(webview_cwv_cb), t, "signal::close-web-view", G_CALLBACK(webview_closewv_cb), t, "signal::event", G_CALLBACK(webview_event_cb), t, - "signal::load-finished", G_CALLBACK(webview_load_finished_cb), t, - "signal::load-progress-changed", G_CALLBACK(webview_progress_changed_cb), t, "signal::icon-loaded", G_CALLBACK(notify_icon_loaded_cb), t, "signal::button_press_event", G_CALLBACK(wv_button_cb), t, "signal::button_release_event", G_CALLBACK(wv_release_button_cb), t, @@ -7847,6 +7843,8 @@ create_new_tab(char *title, struct undo *u, int focus, int position) "notify::load-status", G_CALLBACK(notify_load_status_cb), t); g_signal_connect(t->wv, "notify::title", G_CALLBACK(notify_title_cb), t); + t->progress_handle = g_signal_connect(t->wv, + "notify::progress", G_CALLBACK(webview_progress_changed_cb), t); /* hijack the unused keys as if we were the browser */ //g_object_connect(G_OBJECT(t->toolbar), |