Add 'folder' property to bookmarks

diff --git a/midori/midori-array.c b/midori/midori-array.c
index e3fec8b873e257ed9b0f667e68c55d18feddd1e7..aa1d2291cf02d889ce02a766668b1ed9a975fbf3 100644 (file)
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -790,6 +790,12 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt,
         value = sqlite3_column_int64 (stmt, column);
         katze_item_set_meta_integer (item, name, value);
     }
+    else if (g_str_equal (name, "folder"))
+    {
+        const unsigned char* folder;
+        folder = sqlite3_column_text (stmt, column);
+        katze_item_set_meta_string (item, name, (gchar*)folder);
+    }
     else
         g_warn_if_reached ();
 }

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 4566d744ce4a4e83ca80da25f0c11b46021304ba..388bcdcd09c7d56ab32b3b9452d3a714c33f8b1e 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6512,7 +6512,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
     if (!db)
         return;
 
-    sqlcmd = "SELECT uri, title, app FROM bookmarks WHERE "
+    sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE "
              " toolbar = 1 ORDER BY type ASC";
 
     array = katze_array_from_sqlite (db, sqlcmd);

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 33687c274905a009515f5d6e61911368c1c9e505..2624f22ac3971a7c3056fe2cc805bb818acddcbe 100644 (file)
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -148,7 +148,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
 
     db = g_object_get_data (G_OBJECT (bookmarks->array), "db");
 
-    sqlcmd = "SELECT uri, title, type, app, toolbar from bookmarks where folder = ?"
+    sqlcmd = "SELECT uri, title, type, app, toolbar, folder from bookmarks where folder = ?"
              " ORDER BY type DESC";
     result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);
     sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free);