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

Fix open directory in tabs in bookmarks sidebar

Browse source
This commit is contained in:
Alexander Butenko 2010-06-30 20:45:14 -04:00 committed by Christian Dywan
parent 62f5a1c974
commit 791c38ae3e
1 changed files with 56 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
panels/midori-bookmarks.c
View file

@ -139,19 +139,15 @@ midori_bookmarks_import_array_db (KatzeArray* array,
} }
} }
static gboolean static KatzeArray*
midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
GtkTreeStore* model,
GtkTreeIter* parent,
const gchar* folder) const gchar* folder)
{ {
sqlite3* db; sqlite3* db;
sqlite3_stmt* statement; sqlite3_stmt* statement;
gint result; gint result;
const gchar* sqlcmd; const gchar* sqlcmd;
KatzeArray* array;
GtkTreeIter iter;
GtkTreeIter root_iter;
db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); db = g_object_get_data (G_OBJECT (bookmarks->array), "db");
@ -161,7 +157,9 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free);
if (result != SQLITE_OK) if (result != SQLITE_OK)
return FALSE; return NULL;
array = katze_array_new (KATZE_TYPE_ITEM);
while ((result = sqlite3_step (statement)) == SQLITE_ROW) while ((result = sqlite3_step (statement)) == SQLITE_ROW)
{ {
@ -183,24 +181,12 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
katze_item_set_meta_integer (item, "toolbar", toolbar); katze_item_set_meta_integer (item, "toolbar", toolbar);
/* type 0 -- folder, 1 -- entry */ /* type 0 -- folder, 1 -- entry */
if (type == 0) if (type == 1)
{ {
gtk_tree_store_insert_with_values (model, &root_iter, parent,
0, 0, item, -1);
/* That's an invisible dummy, so we always have an expander */
gtk_tree_store_insert_with_values (model, &iter, &root_iter,
0, 0, NULL, -1);
}
else
{
if (!uri)
continue;
katze_item_set_uri (item, (gchar*)uri); katze_item_set_uri (item, (gchar*)uri);
katze_item_set_meta_integer (item, "app", app); katze_item_set_meta_integer (item, "app", app);
gtk_tree_store_insert_with_values (model, NULL, parent,
0, 0, item, -1);
} }
katze_array_add_item (array, item);
} }
if (result != SQLITE_DONE) if (result != SQLITE_DONE)
@ -208,7 +194,39 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
sqlite3_errmsg (db)); sqlite3_errmsg (db));
sqlite3_finalize (statement); sqlite3_finalize (statement);
return FALSE; return array;
}
static void
midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks,
GtkTreeStore* model,
GtkTreeIter* parent,
const gchar* folder)
{
KatzeArray* array;
KatzeItem* child;
GtkTreeIter iter;
GtkTreeIter root_iter;
guint i = 0;
array = midori_bookmarks_read_from_db (bookmarks, folder);
while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i)))
{
if (ITEM_IS_BOOKMARK (child))
{
gtk_tree_store_insert_with_values (model, NULL, parent,
0, 0, child, -1);
}
else
{
gtk_tree_store_insert_with_values (model, &root_iter, parent,
0, 0, child, -1);
/* That's an invisible dummy, so we always have an expander */
gtk_tree_store_insert_with_values (model, &iter, &root_iter,
0, 0, NULL, -1);
}
i++;
}
} }
void void
@ -491,7 +509,7 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview);
#if HAVE_SQLITE #if HAVE_SQLITE
midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "");
g_signal_connect_after (model, "row-changed", g_signal_connect_after (model, "row-changed",
G_CALLBACK (midori_bookmarks_row_changed_cb), G_CALLBACK (midori_bookmarks_row_changed_cb),
bookmarks); bookmarks);
@ -666,10 +684,12 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem,
if (ITEM_IS_FOLDER (item)) if (ITEM_IS_FOLDER (item))
{ {
KatzeItem* child; KatzeItem* child;
KatzeArray* array;
guint i = 0; guint i = 0;
g_return_if_fail (KATZE_IS_ARRAY (item)); array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item));
while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) g_return_if_fail (KATZE_IS_ARRAY (array));
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,9 +706,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem,
i++; i++;
} }
} }
else else if ((uri = katze_item_get_uri (item)) && *uri)
{
if ((uri = katze_item_get_uri (item)) && *uri)
{ {
MidoriBrowser* browser; MidoriBrowser* browser;
MidoriWebSettings* settings; MidoriWebSettings* settings;
@ -700,7 +718,6 @@ midori_bookmarks_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);
} }
}
} }
static void static void
@ -887,7 +904,7 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview,
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
gtk_tree_model_get (model, iter, 0, &item, -1); gtk_tree_model_get (model, iter, 0, &item, -1);
#if HAVE_SQLITE #if HAVE_SQLITE
midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model),
iter, katze_item_get_name (item)); iter, katze_item_get_name (item));
#endif #endif
g_object_unref (item); g_object_unref (item);