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

Properly synchronize the proxy item of the view

Browse source
This commit is contained in:
Christian Dywan 2009-01-24 22:28:07 +01:00
parent d6cdac4072
commit cf9ec7755f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/midori-view.c
View file

@ -545,6 +545,8 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
uri = webkit_web_frame_get_uri (web_frame); uri = webkit_web_frame_get_uri (web_frame);
g_return_if_fail (uri != NULL); g_return_if_fail (uri != NULL);
katze_assign (view->uri, g_strdup (uri)); katze_assign (view->uri, g_strdup (uri));
if (view->item)
katze_item_set_uri (view->item, 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);
@ -1552,6 +1554,8 @@ midori_view_set_uri (MidoriView* view,
{ {
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");
if (view->item)
katze_item_set_uri (view->item, uri);
data = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); data = g_strdup_printf ("%s - %s", _("Source"), &uri[12]);
g_object_set (view, "title", data, NULL); g_object_set (view, "title", data, NULL);
g_free (data); g_free (data);
@ -1612,6 +1616,8 @@ midori_view_set_uri (MidoriView* view,
WEBKIT_WEB_VIEW (view->web_view), data, view->uri); WEBKIT_WEB_VIEW (view->web_view), data, view->uri);
g_free (data); g_free (data);
g_object_notify (G_OBJECT (view), "uri"); g_object_notify (G_OBJECT (view), "uri");
if (view->item)
katze_item_set_uri (view->item, uri);
return; return;
} }
} }
@ -1623,6 +1629,8 @@ midori_view_set_uri (MidoriView* view,
{ {
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");
if (view->item)
katze_item_set_uri (view->item, uri);
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri);
} }
} }