diff --git a/midori/main.c b/midori/main.c index d0f62df3..53dfa035 100644 --- a/midori/main.c +++ b/midori/main.c @@ -45,12 +45,6 @@ #include #endif -#if HAVE_HILDON - #define BOOKMARK_FILE "/home/user/.bookmarks/MyBookmarks.xml" -#else - #define BOOKMARK_FILE "bookmarks.xbel" -#endif - #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H #include #include @@ -2362,21 +2356,6 @@ main (int argc, _("Bookmarks couldn't be loaded: %s\n"), errmsg); errmsg = NULL; } - else if (!bookmarks_exist) - { - /* Initial creation, import old bookmarks */ - gchar* old_bookmarks; - if (g_path_is_absolute (BOOKMARK_FILE)) - old_bookmarks = g_strdup (BOOKMARK_FILE); - else - old_bookmarks = g_build_filename (config, BOOKMARK_FILE, NULL); - if (g_access (old_bookmarks, F_OK) == 0) - { - midori_bookmarks_import (old_bookmarks, db); - /* Leave old bookmarks around */ - } - g_free (old_bookmarks); - } g_object_set_data (G_OBJECT (bookmarks), "db", db); midori_startup_timer ("Bookmarks read: \t%f"); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5267d83c..dba7b757 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4253,6 +4253,7 @@ _action_bookmarks_import_activate (GtkAction* action, { ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" }, { ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" }, { ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" }, + { ".config/midori/bookmarks.xbel", N_("Midori 0.2.6"), "midori" }, }; GtkWidget* dialog;