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

Propagate URI changes and update Back, Forward actions

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/725826
This commit is contained in:
Christian Dywan 2011-02-27 01:48:06 +01:00
parent 312821b016
commit 0e30ea3779
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-browser.c
View file

@ -557,15 +557,18 @@ midori_view_context_ready_cb (GtkWidget* view,
} }
static void static void
midori_view_notify_uri_cb (GtkWidget* view, midori_view_notify_uri_cb (GtkWidget* widget,
GParamSpec* pspec, GParamSpec* pspec,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (view == midori_browser_get_current_tab (browser)) if (widget == midori_browser_get_current_tab (browser))
{ {
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); MidoriView* view = MIDORI_VIEW (widget);
const gchar* uri = midori_view_get_display_uri (view);
GtkAction* action = _action_by_name (browser, "Location"); GtkAction* action = _action_by_name (browser, "Location");
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
} }
} }

11
midori/midori-view.c
View file

@ -1556,6 +1556,15 @@ 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)
{
katze_assign (view->uri, g_strdup (webkit_web_view_get_uri (web_view)));
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,
@ -3613,6 +3622,8 @@ 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