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

Move Midori 0.2.6 era bookmarks to import dialog

Browse source
This commit is contained in:
Christian Dywan 2012-06-16 00:31:10 +02:00
parent cb0d99484e
commit aa51909f69
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
midori/main.c
View file

@ -45,12 +45,6 @@
#include <signal.h> #include <signal.h>
#endif #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 #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -2362,21 +2356,6 @@ main (int argc,
_("Bookmarks couldn't be loaded: %s\n"), errmsg); _("Bookmarks couldn't be loaded: %s\n"), errmsg);
errmsg = NULL; 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); g_object_set_data (G_OBJECT (bookmarks), "db", db);
midori_startup_timer ("Bookmarks read: \t%f"); midori_startup_timer ("Bookmarks read: \t%f");

1
midori/midori-browser.c
View file

@ -4253,6 +4253,7 @@ _action_bookmarks_import_activate (GtkAction* action,
{ ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" }, { ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" },
{ ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" }, { ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" },
{ ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" }, { ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" },
{ ".config/midori/bookmarks.xbel", N_("Midori 0.2.6"), "midori" },
}; };
GtkWidget* dialog; GtkWidget* dialog;