debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace _web_view_open with _load_uri

Browse source
This commit is contained in:
Christian Dywan 2012-07-17 21:56:56 +02:00
parent 2f2b33abee
commit 760f4895a3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/main.c
View file

@ -2145,7 +2145,7 @@ main (int argc,
#endif #endif
g_signal_connect (web_view, "load-finished", g_signal_connect (web_view, "load-finished",
G_CALLBACK (snapshot_load_finished_cb), filename); G_CALLBACK (snapshot_load_finished_cb), filename);
webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), snapshot);
gtk_main (); gtk_main ();
g_free (filename); g_free (filename);
return 0; return 0;

10
midori/midori-view.c
View file

@ -3826,7 +3826,7 @@ midori_view_construct_web_view (MidoriView* view)
view->web_view = webkit_web_view_new (); view->web_view = webkit_web_view_new ();
/* Load something to avoid a bug where WebKit might not set a main frame */ /* Load something to avoid a bug where WebKit might not set a main frame */
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), ""); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), "");
#if HAVE_HILDON #if HAVE_HILDON
gtk_widget_tap_and_hold_setup (view->web_view, NULL, NULL, 0); gtk_widget_tap_and_hold_setup (view->web_view, NULL, NULL, 0);
@ -4453,7 +4453,7 @@ midori_view_set_uri (MidoriView* view,
katze_item_set_uri (view->item, view->uri); katze_item_set_uri (view->item, view->uri);
katze_assign (view->title, NULL); katze_assign (view->title, NULL);
g_object_notify (G_OBJECT (view), "uri"); g_object_notify (G_OBJECT (view), "uri");
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), uri);
} }
} }
} }
@ -6145,8 +6145,8 @@ thumb_view_load_status_cb (WebKitWebView* thumb_view_,
{ {
g_object_set_data_full (G_OBJECT (thumb_view), "spec", g_object_set_data_full (G_OBJECT (thumb_view), "spec",
thumb_queue->data, (GDestroyNotify)g_free); thumb_queue->data, (GDestroyNotify)g_free);
webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), webkit_web_view_load_uri (WEBKIT_WEB_VIEW (thumb_view),
strstr (thumb_queue->data, "|") + 1); strstr (thumb_queue->data, "|") + 1);
} }
else else
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
@ -6223,7 +6223,7 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
thumb_queue->data, (GDestroyNotify)g_free); thumb_queue->data, (GDestroyNotify)g_free);
g_signal_connect (thumb_view, "notify::load-status", g_signal_connect (thumb_view, "notify::load-status",
G_CALLBACK (thumb_view_load_status_cb), view); G_CALLBACK (thumb_view_load_status_cb), view);
webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), url); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (thumb_view), url);
} }
/** /**