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

Remove last bits of 'type' field usage

Browse source
This commit is contained in:
Alexander Butenko 2010-07-02 12:59:09 -04:00 committed by Christian Dywan
parent 9230c299e9
commit 2caaed659c
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/midori-array.c
View file

@ -784,7 +784,7 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt,
katze_item_set_added (item, date); katze_item_set_added (item, date);
} }
else if (g_str_equal (name, "day") || g_str_equal (name, "app") 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; gint value;
value = sqlite3_column_int64 (stmt, column); value = sqlite3_column_int64 (stmt, column);

4
midori/midori-browser.c
View file

@ -6513,7 +6513,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
return; return;
sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE " 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); array = katze_array_from_sqlite (db, sqlcmd);
if (!array) if (!array)
@ -6533,7 +6533,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
gchar* subsqlcmd; gchar* subsqlcmd;
subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " 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); subfolder = katze_array_from_sqlite (db, subsqlcmd);
katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item));
midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder));

4
panels/midori-bookmarks.c
View file

@ -148,8 +148,8 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); db = g_object_get_data (G_OBJECT (bookmarks->array), "db");
sqlcmd = "SELECT uri, title, type, app, toolbar, folder from bookmarks where folder = ?" sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where folder = ?"
" ORDER BY type DESC"; " ORDER BY uri DESC";
result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);
sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free);