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

Simplify handling of background tabs

Browse source
This commit is contained in:
Jérôme Geulfucci 2009-05-08 13:09:14 +02:00 committed by Christian Dywan
parent f60b8ab9b6
commit 713a9b02ca
1 changed files with 12 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
midori/midori-browser.c
View file

@ -902,8 +902,7 @@ midori_view_new_tab_cb (GtkWidget* view,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
gint n = midori_browser_add_uri (browser, uri); gint n = midori_browser_add_uri (browser, uri);
if (!background) _midori_browser_set_current_page_smartly (browser, n);
midori_browser_set_current_page (browser, n);
} }
static void static void
@ -2187,15 +2186,10 @@ _action_trash_activate_item_alt (GtkAction* action,
if (button == 2) if (button == 2)
{ {
gint n; gint n;
gboolean open_in_background;
g_object_get (browser->settings, "open-tabs-in-the-background",
&open_in_background, NULL);
n = midori_browser_add_uri (browser, katze_item_get_uri (item)); n = midori_browser_add_uri (browser, katze_item_get_uri (item));
if (!open_in_background) _midori_browser_set_current_page_smartly (browser, n);
midori_browser_set_current_page (browser, n);
katze_array_remove_item (browser->trash, item); katze_array_remove_item (browser->trash, item);
_midori_browser_update_actions (browser); _midori_browser_update_actions (browser);
@ -2262,16 +2256,8 @@ _action_menus_activate_item_alt (GtkAction* action,
{ {
if (button == 2) if (button == 2)
{ {
gint n; gint n = midori_browser_add_uri (browser, katze_item_get_uri (item));
gboolean open_in_background; _midori_browser_set_current_page_smartly (browser, n);
g_object_get (browser->settings, "open-tabs-in-the-background",
&open_in_background, NULL);
n = midori_browser_add_uri (browser, katze_item_get_uri (item));
if (!open_in_background)
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -3056,7 +3042,6 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
{ {
GtkAction* action = gtk_widget_get_action (toolitem); GtkAction* action = gtk_widget_get_action (toolitem);
const gchar* name; const gchar* name;
gboolean open_in_background = FALSE;
gchar* homepage; gchar* homepage;
g_return_val_if_fail (action != NULL, FALSE); g_return_val_if_fail (action != NULL, FALSE);
@ -3064,9 +3049,6 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
if (!browser->settings) if (!browser->settings)
return FALSE; return FALSE;
g_object_get (browser->settings, "open-tabs-in-the-background",
&open_in_background, NULL);
g_object_get (browser->settings, "homepage", &homepage, NULL); g_object_get (browser->settings, "homepage", &homepage, NULL);
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
@ -3077,8 +3059,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
n = midori_browser_add_uri (browser, homepage); n = midori_browser_add_uri (browser, homepage);
if (!open_in_background) _midori_browser_set_current_page_smartly (browser, n);
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -3100,8 +3081,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
n = midori_browser_add_uri (browser, back_uri); n = midori_browser_add_uri (browser, back_uri);
if (!open_in_background) _midori_browser_set_current_page_smartly (browser, n);
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -3123,9 +3103,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
forward_uri = webkit_web_history_item_get_uri (forward_item); forward_uri = webkit_web_history_item_get_uri (forward_item);
n = midori_browser_add_uri (browser, forward_uri); n = midori_browser_add_uri (browser, forward_uri);
_midori_browser_set_current_page_smartly (browser, n);
if (!open_in_background)
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -3142,18 +3120,15 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem,
{ {
KatzeItem* item; KatzeItem* item;
gint n; gint n;
gboolean open_in_background;
if (event->button == 2) if (event->button == 2)
{ {
item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
if (katze_item_get_uri (item)) if (katze_item_get_uri (item))
{ {
g_object_get (browser->settings, "open-tabs-in-the-background",
&open_in_background, NULL);
n = midori_browser_add_uri (browser, katze_item_get_uri (item)); n = midori_browser_add_uri (browser, katze_item_get_uri (item));
if (!open_in_background) _midori_browser_set_current_page_smartly (browser, n);
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
} }
@ -4690,7 +4665,6 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
GtkWidget* parent = gtk_widget_get_parent (toolitem); GtkWidget* parent = gtk_widget_get_parent (toolitem);
GtkAction* action = gtk_widget_get_action (parent); GtkAction* action = gtk_widget_get_action (parent);
const gchar* name; const gchar* name;
gboolean open_in_background = FALSE;
gchar* homepage; gchar* homepage;
g_return_val_if_fail (action != NULL, FALSE); g_return_val_if_fail (action != NULL, FALSE);
@ -4698,9 +4672,6 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
if (!browser->settings) if (!browser->settings)
return FALSE; return FALSE;
g_object_get (browser->settings, "open-tabs-in-the-background",
&open_in_background, NULL);
g_object_get (browser->settings, "homepage", &homepage, NULL); g_object_get (browser->settings, "homepage", &homepage, NULL);
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
@ -4710,9 +4681,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
gint n; gint n;
n = midori_browser_add_uri (browser, homepage); n = midori_browser_add_uri (browser, homepage);
_midori_browser_set_current_page_smartly (browser, n);
if (!open_in_background)
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -4733,9 +4702,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
back_uri = webkit_web_history_item_get_uri (back_item); back_uri = webkit_web_history_item_get_uri (back_item);
n = midori_browser_add_uri (browser, back_uri); n = midori_browser_add_uri (browser, back_uri);
_midori_browser_set_current_page_smartly (browser, n);
if (!open_in_background)
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }
@ -4757,9 +4724,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
forward_uri = webkit_web_history_item_get_uri (forward_item); forward_uri = webkit_web_history_item_get_uri (forward_item);
n = midori_browser_add_uri (browser, forward_uri); n = midori_browser_add_uri (browser, forward_uri);
_midori_browser_set_current_page_smartly (browser, n);
if (!open_in_background)
midori_browser_set_current_page (browser, n);
return TRUE; return TRUE;
} }