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

Be sure to only migrate bookmarks if .db doesn't exist

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/711377
This commit is contained in:
Christian Dywan 2011-02-17 19:45:23 +01:00
parent 40a6743e78
commit 503ed3ac94
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/main.c
View file

@ -1647,6 +1647,7 @@ main (int argc,
MidoriWebSettings* settings; MidoriWebSettings* settings;
gchar* config_file; gchar* config_file;
gchar* bookmarks_file; gchar* bookmarks_file;
gboolean bookmarks_exist;
MidoriStartup load_on_startup; MidoriStartup load_on_startup;
KatzeArray* search_engines; KatzeArray* search_engines;
KatzeArray* bookmarks; KatzeArray* bookmarks;
@ -1980,6 +1981,7 @@ main (int argc,
bookmarks = katze_array_new (KATZE_TYPE_ARRAY); bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
bookmarks_file = g_build_filename (config, "bookmarks.db", NULL); bookmarks_file = g_build_filename (config, "bookmarks.db", NULL);
bookmarks_exist = g_access (bookmarks_file, F_OK) == 0;
errmsg = NULL; errmsg = NULL;
if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL) if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL)
{ {
@ -1987,8 +1989,9 @@ main (int argc,
_("Bookmarks couldn't be loaded: %s\n"), errmsg); _("Bookmarks couldn't be loaded: %s\n"), errmsg);
g_free (errmsg); g_free (errmsg);
} }
else else if (!bookmarks_exist)
{ {
/* Initial creation, import old bookmarks */
gchar* old_bookmarks; gchar* old_bookmarks;
if (g_path_is_absolute (BOOKMARK_FILE)) if (g_path_is_absolute (BOOKMARK_FILE))
old_bookmarks = g_strdup (BOOKMARK_FILE); old_bookmarks = g_strdup (BOOKMARK_FILE);
@ -2000,8 +2003,8 @@ main (int argc,
/* Leave old bookmarks around */ /* Leave old bookmarks around */
} }
g_free (old_bookmarks); g_free (old_bookmarks);
g_object_set_data (G_OBJECT (bookmarks), "db", db);
} }
g_object_set_data (G_OBJECT (bookmarks), "db", db);
midori_startup_timer ("Bookmarks read: \t%f"); midori_startup_timer ("Bookmarks read: \t%f");
config_file = NULL; config_file = NULL;