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

Reset and update icon after checking main frame

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/974783
This commit is contained in:
Christian Dywan 2012-05-12 03:02:32 +02:00
parent 5b4759c045
commit b29e1278f9
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-view.c
View file

@ -1032,6 +1032,9 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
const gchar* uri; const gchar* uri;
GList* children; GList* children;
if (web_frame != webkit_web_view_get_main_frame (web_view))
return;
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);
@ -1529,6 +1532,7 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
g_object_notify (G_OBJECT (view), "progress"); g_object_notify (G_OBJECT (view), "progress");
midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); midori_view_update_load_status (view, MIDORI_LOAD_FINISHED);
if (web_frame == webkit_web_view_get_main_frame (web_view))
{ {
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
/* Icon: URI, News Feed: $URI|title, Search: :URI|title */ /* Icon: URI, News Feed: $URI|title, Search: :URI|title */
@ -1612,11 +1616,11 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
g_free (value); g_free (value);
/* Ensure load-status is notified again, whether it changed or not */ /* Ensure load-status is notified again, whether it changed or not */
g_object_notify (G_OBJECT (view), "load-status"); g_object_notify (G_OBJECT (view), "load-status");
}
#if !WEBKIT_CHECK_VERSION (1, 4, 3) #if !WEBKIT_CHECK_VERSION (1, 4, 3)
_midori_web_view_load_icon (view); _midori_web_view_load_icon (view);
#endif #endif
}
g_object_thaw_notify (G_OBJECT (view)); g_object_thaw_notify (G_OBJECT (view));
} }
@ -2864,9 +2868,12 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
view_source = TRUE; view_source = TRUE;
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source); webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source);
if (web_frame == webkit_web_view_get_main_frame (web_view))
{
katze_assign (view->mime_type, g_strdup (mime_type)); katze_assign (view->mime_type, g_strdup (mime_type));
midori_view_unset_icon (view); midori_view_unset_icon (view);
g_object_notify (G_OBJECT (view), "mime-type"); g_object_notify (G_OBJECT (view), "mime-type");
}
return FALSE; return FALSE;
} }