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

Import to a new, empty bookmark array

Browse source
This commit is contained in:
Christian Dywan 2011-01-22 21:24:10 +01:00
parent 7a0d04ac52
commit f9c38fda6f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
midori/midori-browser.c
View file

@ -4004,6 +4004,7 @@ _action_bookmarks_import_activate (GtkAction* action,
gint icon_width = 16; gint icon_width = 16;
guint i; guint i;
KatzeItem* item; KatzeItem* item;
KatzeArray* bookmarks;
sqlite3* db; sqlite3* db;
const gchar* sqlcmd; const gchar* sqlcmd;
KatzeArray* bookmarkdirs; KatzeArray* bookmarkdirs;
@ -4110,15 +4111,17 @@ _action_bookmarks_import_activate (GtkAction* action,
} }
error = NULL; error = NULL;
if (path && !midori_array_from_file (browser->bookmarks, path, NULL, &error)) bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
if (path && !midori_array_from_file (bookmarks, path, NULL, &error))
{ {
sokoke_message_dialog (GTK_MESSAGE_ERROR, sokoke_message_dialog (GTK_MESSAGE_ERROR,
_("Failed to import bookmarks"), error ? error->message : ""); _("Failed to import bookmarks"), error ? error->message : "");
if (error) if (error)
g_error_free (error); g_error_free (error);
} }
midori_bookmarks_import_array_db (db, browser->bookmarks, selected); midori_bookmarks_import_array_db (db, bookmarks, selected);
katze_array_update (browser->bookmarks); katze_array_update (browser->bookmarks);
g_object_unref (bookmarks);
g_free (selected); g_free (selected);
g_free (path); g_free (path);
} }