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

Always append tabs opened via middle/ double click on the tab bar

Browse source
This commit is contained in:
Christian Dywan 2009-05-17 16:49:46 +02:00
parent 87e712f51c
commit e3ed65c3f2
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
midori/midori-browser.c
View file

@ -1460,7 +1460,8 @@ _midori_browser_add_tab (MidoriBrowser* browser,
midori_browser_tab_leave_notify_event_cb, browser, midori_browser_tab_leave_notify_event_cb, browser,
NULL); NULL);
if (browser->settings && if (!g_object_get_data (G_OBJECT (view), "midori-view-append") &&
browser->settings &&
katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) katze_object_get_boolean (browser->settings, "open-tabs-next-to-current"))
{ {
n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
@ -1857,7 +1858,6 @@ _action_tab_new_activate (GtkAction* action,
{ {
gint n = midori_browser_add_uri (browser, ""); gint n = midori_browser_add_uri (browser, "");
midori_browser_set_current_page (browser, n); midori_browser_set_current_page (browser, n);
gtk_action_activate (_action_by_name (browser, "Location"));
} }
static void static void
@ -3791,7 +3791,20 @@ gtk_notebook_button_press_event_cb (GtkNotebook* notebook,
&& ((event->type == GDK_2BUTTON_PRESS && event->button == 1) && ((event->type == GDK_2BUTTON_PRESS && event->button == 1)
|| (event->type == GDK_BUTTON_PRESS && event->button == 2))) || (event->type == GDK_BUTTON_PRESS && event->button == 2)))
{ {
gtk_action_activate (_action_by_name (browser, "TabNew")); gint n;
GtkWidget* view;
if (browser->settings)
view = g_object_new (MIDORI_TYPE_VIEW,
"settings", browser->settings,
"net", browser->net, NULL);
else
view = midori_view_new (browser->net);
midori_view_set_uri (MIDORI_VIEW (view), "");
gtk_widget_show (view);
g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1);
n = midori_browser_add_tab (browser, view);
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }