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

Fix for Open all in tabs for directories in history bar

Browse source
This commit is contained in:
Alexander Butenko 2010-07-02 11:47:55 -04:00 committed by Christian Dywan
parent b170dd688a
commit 9230c299e9
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
panels/midori-history.c
View file

@ -12,6 +12,7 @@
#include "midori-history.h" #include "midori-history.h"
#include "midori-app.h" #include "midori-app.h"
#include "midori-array.h"
#include "midori-browser.h" #include "midori-browser.h"
#include "midori-stock.h" #include "midori-stock.h"
#include "midori-view.h" #include "midori-view.h"
@ -667,12 +668,22 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem,
guint n; guint n;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
if (KATZE_IS_ARRAY (item)) if (KATZE_ITEM_IS_FOLDER (item))
{ {
sqlite3* db;
gchar* sqlcmd;
KatzeItem* child; KatzeItem* child;
KatzeArray* array;
guint i = 0; guint i = 0;
while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) db = g_object_get_data (G_OBJECT (history->array), "db");
sqlcmd = g_strdup_printf ("SELECT uri, title, date, day "
"FROM history WHERE day = %d "
"GROUP BY uri ORDER BY date ASC",
(int)katze_item_get_added (item));
array = katze_array_from_sqlite (db, sqlcmd);
g_free (sqlcmd);
while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i++)))
{ {
if ((uri = katze_item_get_uri (child)) && *uri) if ((uri = katze_item_get_uri (child)) && *uri)
{ {
@ -686,7 +697,6 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem,
midori_browser_set_current_page (browser, n); midori_browser_set_current_page (browser, n);
g_object_unref (settings); g_object_unref (settings);
} }
i++;
} }
} }
else else