Notify URI even before it is "committed" and add an error check

This commit is contained in:
Christian Dywan 2009-01-17 19:38:00 +01:00
parent 07bcc0acfa
commit 93bb9f6c5b

View file

@ -543,6 +543,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
g_object_freeze_notify (G_OBJECT (view)); g_object_freeze_notify (G_OBJECT (view));
uri = webkit_web_frame_get_uri (web_frame); uri = webkit_web_frame_get_uri (web_frame);
g_return_if_fail (uri != NULL);
katze_assign (view->uri, g_strdup (uri)); katze_assign (view->uri, g_strdup (uri));
g_object_notify (G_OBJECT (view), "uri"); g_object_notify (G_OBJECT (view), "uri");
g_object_set (view, "title", NULL, NULL); g_object_set (view, "title", NULL, NULL);
@ -1621,6 +1622,7 @@ midori_view_set_uri (MidoriView* view,
else else
{ {
katze_assign (view->uri, g_strdup (uri)); katze_assign (view->uri, g_strdup (uri));
g_object_notify (G_OBJECT (view), "uri");
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri);
} }
} }