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

Stop listening to notify::uri signal. load-status is enough

Browse source
This commit is contained in:
Alexander Butenko 2010-07-21 13:47:08 -04:00 committed by Christian Dywan
parent 44a2351b72
commit 3aa48c34b5
2 changed files with 1 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/midori-browser.c
View file

@ -591,7 +591,6 @@ midori_view_notify_uri_cb (GtkWidget* view,
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
GtkAction* action = _action_by_name (browser, "Location"); GtkAction* action = _action_by_name (browser, "Location");
midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri);
_midori_browser_update_interface (browser);
} }
} }

57
midori/midori-view.c
View file

@ -1423,59 +1423,6 @@ midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
#endif #endif
#if WEBKIT_CHECK_VERSION (1, 1, 4) #if WEBKIT_CHECK_VERSION (1, 1, 4)
static void
webkit_web_view_notify_uri_cb (WebKitWebView* web_view,
GParamSpec* pspec,
MidoriView* view)
{
#if 0
if (view->item)
{
/* Save back forward history as meta data. This is disabled
because we can't reliably restore these atm. */
WebKitWebView* web_view;
WebKitWebBackForwardList* list;
GList* back;
GList* forward;
web_view = WEBKIT_WEB_VIEW (view->web_view);
list = webkit_web_view_get_back_forward_list (web_view);
back = webkit_web_back_forward_list_get_back_list_with_limit (list, 5);
forward = webkit_web_back_forward_list_get_forward_list_with_limit (list, 5);
guint i;
WebKitWebHistoryItem* item;
gchar* key = g_strdup ("back0");
i = 0;
while ((item = g_list_nth_data (back, i++)))
{
katze_item_set_meta_string (view->item, key,
webkit_web_history_item_get_uri (item));
key[4] = 48 + i;
}
#if 0
key[0] = 'f';
key[1] = 'o';
key[2] = 'r';
key[3] = 'e';
key[4] = 48;
i = 0;
while ((item = g_list_nth_data (forward, i++)))
{
katze_item_set_meta_string (view->item, key,
webkit_web_history_item_get_uri (item));
key[4] = 48 + i;
}
#endif
g_free (key);
}
#endif
g_object_get (web_view, "uri", &view->uri, NULL);
g_object_notify (G_OBJECT (view), "uri");
}
static void static void
webkit_web_view_notify_title_cb (WebKitWebView* web_view, webkit_web_view_notify_title_cb (WebKitWebView* web_view,
GParamSpec* pspec, GParamSpec* pspec,
@ -1549,7 +1496,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view,
gboolean background; gboolean background;
event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; event->state = event->state & MIDORI_KEYS_MODIFIER_MASK;
link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); link_uri = midori_view_get_link_uri (view);
switch (event->button) switch (event->button)
{ {
@ -3388,8 +3335,6 @@ midori_view_construct_web_view (MidoriView* view)
midori_web_view_notify_icon_uri_cb, view, midori_web_view_notify_icon_uri_cb, view,
#endif #endif
#if WEBKIT_CHECK_VERSION (1, 1, 4) #if WEBKIT_CHECK_VERSION (1, 1, 4)
"signal::notify::uri",
webkit_web_view_notify_uri_cb, view,
"signal::notify::title", "signal::notify::title",
webkit_web_view_notify_title_cb, view, webkit_web_view_notify_title_cb, view,
#else #else