[Xfce4-commits] <midori:master> Replace _web_view_open with _load_uri

[Christian Dywan]

Updating branch refs/heads/master
         to 760f4895a378e07d24481a0686342b14eed5e27e (commit)
       from 2f2b33abeed9890b884875556d9758ac4b247905 (commit)

commit 760f4895a378e07d24481a0686342b14eed5e27e
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Jul 17 21:56:56 2012 +0200

    Replace _web_view_open with _load_uri

 midori/main.c        |    2 +-
 midori/midori-view.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 6a3e59a..3044809 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2145,7 +2145,7 @@ main (int    argc,
         #endif
         g_signal_connect (web_view, "load-finished",
             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 ();
         g_free (filename);
         return 0;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 4cbad7b..a6eba18 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3826,7 +3826,7 @@ midori_view_construct_web_view (MidoriView* view)
     view->web_view = webkit_web_view_new ();
 
     /* 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
     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_assign (view->title, NULL);
             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",
                                 thumb_queue->data, (GDestroyNotify)g_free);
-        webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view),
-                              strstr (thumb_queue->data, "|") + 1);
+        webkit_web_view_load_uri (WEBKIT_WEB_VIEW (thumb_view),
+                                  strstr (thumb_queue->data, "|") + 1);
     }
     else
         g_signal_handlers_disconnect_by_func (
@@ -6223,7 +6223,7 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
                             thumb_queue->data, (GDestroyNotify)g_free);
     g_signal_connect (thumb_view, "notify::load-status",
         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);
 }
 
 /**