Updating branch refs/heads/master
to 6fb35107a0d948b4e8f20d13641133ec9643013b (commit)
from 3c4896f94fb507afc00ac83bb54656293a0a8904 (commit)
commit 6fb35107a0d948b4e8f20d13641133ec9643013b
Author: Alexander Butenko <[email protected]>
Date: Thu Jul 1 15:42:54 2010 -0400
Fix for folders in bookmarksbar
midori/midori-browser.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5bbba4e..99488a9 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6531,7 +6531,20 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i)))
{
- midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
+ if (KATZE_ITEM_IS_BOOKMARK (item))
+ midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
+ else
+ {
+ KatzeArray* subfolder;
+ gchar* subsqlcmd;
+
+ subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM
bookmarks WHERE "
+ " folder = '%s'", katze_item_get_name
(item));
+ subfolder = katze_array_from_sqlite (db, sqlcmd);
+ katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name
(item));
+ midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM
(subfolder));
+ g_free (subsqlcmd);
+ }
i++;
}
_action_set_sensitive (browser, "BookmarkAdd", TRUE);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
