From 2caaed659c1ecd6ef47db813db90eb5daade88cb Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 12:59:09 -0400 Subject: [PATCH] Remove last bits of 'type' field usage --- midori/midori-array.c | 2 +- midori/midori-browser.c | 4 ++-- panels/midori-bookmarks.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index aa1d2291..35c938a9 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -784,7 +784,7 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, katze_item_set_added (item, date); } else if (g_str_equal (name, "day") || g_str_equal (name, "app") - || g_str_equal (name, "toolbar") || g_str_equal (name, "type")) + || g_str_equal (name, "toolbar")) { gint value; value = sqlite3_column_int64 (stmt, column); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5dbb2bfd..7397a987 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6513,7 +6513,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) return; sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE " - " toolbar = 1 ORDER BY type ASC"; + " toolbar = 1 ORDER BY uri ASC"; array = katze_array_from_sqlite (db, sqlcmd); if (!array) @@ -6533,7 +6533,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) gchar* subsqlcmd; subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " - " folder = '%s'", katze_item_get_name (item)); + " folder = '%s' and uri != ''", katze_item_get_name (item)); subfolder = katze_array_from_sqlite (db, subsqlcmd); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index b8c9b69c..393cb66d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -148,8 +148,8 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - sqlcmd = "SELECT uri, title, type, app, toolbar, folder from bookmarks where folder = ?" - " ORDER BY type DESC"; + sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where folder = ?" + " ORDER BY uri DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free);