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

Fix middle click toolbar and menu actions.

Browse source 
This fixes a regression where a middle click would no longer open
'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
This commit is contained in:
Jérôme Guelfucci 2011-08-02 20:30:09 +02:00 committed by Christian Dywan
parent edf6192978
commit 8175e36e7f
1 changed files with 89 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
midori/midori-browser.c
View file

@ -3499,14 +3499,20 @@ _action_navigation_activate (GtkAction* action,
GtkWidget* tab; GtkWidget* tab;
gchar* uri; gchar* uri;
const gchar* name; const gchar* name;
gboolean middle_click;
g_assert (GTK_IS_ACTION (action)); g_assert (GTK_IS_ACTION (action));
if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action),
"midori-middle-click")))
{ {
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); middle_click = TRUE;
return FALSE; g_object_set_data (G_OBJECT (action),
"midori-middle-click",
GINT_TO_POINTER(0));
} }
else
middle_click = FALSE;
tab = midori_browser_get_current_tab (browser); tab = midori_browser_get_current_tab (browser);
if (!tab) if (!tab)
@ -3518,19 +3524,69 @@ _action_navigation_activate (GtkAction* action,
if (g_str_equal (name, "Back")) if (g_str_equal (name, "Back"))
{ {
midori_view_go_back (view); if (middle_click)
{
GtkWidget* web_view;
WebKitWebBackForwardList* back_forward_list;
WebKitWebHistoryItem* back_item;
const gchar* back_uri;
gint n;
web_view = midori_view_get_web_view (view);
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view));
back_item = webkit_web_back_forward_list_get_back_item (back_forward_list);
back_uri = webkit_web_history_item_get_uri (back_item);
n = midori_browser_add_uri (browser, back_uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_go_back (view);
return TRUE; return TRUE;
} }
else if (g_str_equal (name, "Forward")) else if (g_str_equal (name, "Forward"))
{ {
midori_view_go_forward (view); if (middle_click)
{
GtkWidget* web_view;
WebKitWebBackForwardList* back_forward_list;
WebKitWebHistoryItem* forward_item;
const gchar* forward_uri;
gint n;
web_view = midori_view_get_web_view (view);
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view));
forward_item = webkit_web_back_forward_list_get_forward_item (back_forward_list);
forward_uri = webkit_web_history_item_get_uri (forward_item);
n = midori_browser_add_uri (browser, forward_uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_go_forward (view);
return TRUE; return TRUE;
} }
else if (g_str_equal (name, "Previous")) else if (g_str_equal (name, "Previous"))
{ {
/* Duplicate here because the URI pointer might change */ /* Duplicate here because the URI pointer might change */
uri = g_strdup (midori_view_get_previous_page (view)); uri = g_strdup (midori_view_get_previous_page (view));
midori_view_set_uri (view, uri);
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
g_free (uri); g_free (uri);
return TRUE; return TRUE;
} }
@ -3538,14 +3594,34 @@ _action_navigation_activate (GtkAction* action,
{ {
/* Duplicate here because the URI pointer might change */ /* Duplicate here because the URI pointer might change */
uri = g_strdup (midori_view_get_next_page (view)); uri = g_strdup (midori_view_get_next_page (view));
midori_view_set_uri (view, uri);
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
g_free (uri); g_free (uri);
return TRUE; return TRUE;
} }
else if (g_str_equal (name, "Homepage")) else if (g_str_equal (name, "Homepage"))
{ {
g_object_get (browser->settings, "homepage", &uri, NULL); g_object_get (browser->settings, "homepage", &uri, NULL);
midori_view_set_uri (view, uri);
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
g_free (uri); g_free (uri);
return TRUE; return TRUE;
} }
@ -4048,6 +4124,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
GtkAction* action; GtkAction* action;
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem)); action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem));
g_object_set_data (G_OBJECT (action), "midori-middle-click", GINT_TO_POINTER (1));
return _action_navigation_activate (action, browser); return _action_navigation_activate (action, browser);
} }
@ -6243,6 +6320,10 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
GtkAction* action = gtk_activatable_get_related_action ( GtkAction* action = gtk_activatable_get_related_action (
GTK_ACTIVATABLE (parent)); GTK_ACTIVATABLE (parent));
g_object_set_data (G_OBJECT (action),
"midori-middle-click",
GINT_TO_POINTER (1));
return _action_navigation_activate (action, browser); return _action_navigation_activate (action, browser);
} }
else if (event->button == 3) else if (event->button == 3)