From 7385b80364c9efd271efea21b8ebca293602dfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Thu, 30 May 2013 19:24:07 +0200 Subject: Fold tabs even if tabs2one tab is present --- extensions/tabs2one.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'extensions') diff --git a/extensions/tabs2one.c b/extensions/tabs2one.c index f0f18b53..d3c67387 100644 --- a/extensions/tabs2one.c +++ b/extensions/tabs2one.c @@ -128,7 +128,7 @@ tabs2one_onload_create_items_cb(WebKitWebView* webview, const gchar* icon; const gchar* title; const gchar* uri; - + GList* tabs = midori_browser_get_tabs (browser); for (; tabs; tabs = g_list_next (tabs)) { @@ -141,13 +141,14 @@ tabs2one_onload_create_items_cb(WebKitWebView* webview, { if (!midori_uri_is_blank (uri)) tabs2one_dom_create_item(doc, icon, uri, title); - - midori_browser_close_tab(browser, tabs->data); } + + midori_browser_close_tab(browser, tabs->data); } tabs2one_dom_add_click_listeners (doc, webview); tabs2one_cache_write_file (webview); + midori_browser_set_current_uri (browser, tabs2one_cache_get_uri ()); g_list_free(tabs); } @@ -203,27 +204,10 @@ static void tabs2one_apply_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - bool exist = FALSE; GtkWidget* tab = NULL; - GList* tabs = midori_browser_get_tabs (browser); - for (; tabs; tabs = g_list_next (tabs)) + if (!tabs2one_cache_exist ()) { - if (tabs2one_is_uri_tabs2one_tab (midori_view_get_display_uri (tabs->data))){ - exist = TRUE; - tab = tabs->data; - break; - } - } - - g_list_free(tabs); - - if (!exist && tabs2one_cache_exist ()){ - tab = midori_browser_add_uri (browser, tabs2one_cache_get_uri ()); - } - - if (!exist && !tabs2one_cache_exist ()){ - const gchar* tpl = "\n" " Tabs to One\n" " \n" @@ -231,9 +215,10 @@ tabs2one_apply_cb (GtkWidget* menuitem, "\n"; g_file_set_contents(tabs2one_cache_get_filename (), tpl, -1, NULL); - tab = midori_browser_add_uri (browser, tabs2one_cache_get_uri ()); } + tab = midori_browser_add_uri (browser, tabs2one_cache_get_uri ()); + WebKitWebView* webview = WEBKIT_WEB_VIEW (midori_view_get_web_view(MIDORI_VIEW (tab))); midori_browser_set_current_tab (browser, tab); -- cgit v1.2.1