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

Add tabs to new browser windows *after* emitting NEW_WINDOW

Browse source 
The app takes care of settings as well as other state when the
NEW_WINDOW signal of a browser is emitted. So we need to add
tabs after emitting the signal, otherwise the new tab has
default settings for a limited period of time.
This commit is contained in:
Christian Dywan 2009-05-22 23:15:53 +02:00
parent 16912f4cdf
commit 56d2637020
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/midori-browser.c
View file

@ -1100,8 +1100,8 @@ midori_view_new_window_cb (GtkWidget* view,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL);
midori_browser_add_uri (new_browser, uri);
g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser);
midori_browser_add_uri (new_browser, uri);
} }
static void static void
@ -1113,9 +1113,9 @@ midori_view_new_view_cb (GtkWidget* view,
if (where == MIDORI_NEW_VIEW_WINDOW) if (where == MIDORI_NEW_VIEW_WINDOW)
{ {
MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL);
g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser);
midori_browser_add_tab (new_browser, new_view); midori_browser_add_tab (new_browser, new_view);
midori_browser_set_current_tab (new_browser, new_view); midori_browser_set_current_tab (new_browser, new_view);
g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser);
} }
else else
{ {
@ -1849,8 +1849,8 @@ _action_window_new_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL);
midori_browser_add_uri (new_browser, "");
g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser);
midori_browser_add_uri (new_browser, "");
} }
static void static void
@ -3177,8 +3177,8 @@ midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem,
if (uri && *uri) if (uri && *uri)
{ {
MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL);
midori_browser_add_uri (new_browser, uri);
g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser);
midori_browser_add_uri (new_browser, uri);
} }
} }