From 90b92dab6b239d3ba9d74e272035db767a2943d4 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 3 Sep 2003 11:31:07 +0000 Subject: Fix galeon bookmarks import for the case of there existing a subdirectory 2003-09-03 Christian Persch * src/bookmarks/ephy-bookmarks-editor.c: (add_bookmarks_source_menu), (cmd_bookmarks_import): Fix galeon bookmarks import for the case of there existing a subdirectory of ~/.galeon having a bookmarks.xbel file. --- ChangeLog | 8 ++++++++ src/bookmarks/ephy-bookmarks-editor.c | 11 ++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb601d5a9..025550f3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-09-03 Christian Persch + + * src/bookmarks/ephy-bookmarks-editor.c: (add_bookmarks_source_menu), + (cmd_bookmarks_import): + + Fix galeon bookmarks import for the case of there existing a subdirectory + of ~/.galeon having a bookmarks.xbel file. + 2003-09-03 Sanlig Badral * configure.in: Added mn to ALL_LINGUAS diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 137f76c01..8c61d8d91 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -454,13 +454,14 @@ static void add_bookmarks_source_menu (GtkWidget *menu, const char *desc, const char *dir, - const char *filename) + const char *filename, + int max_depth) { GSList *l; char *path; path = g_build_filename (g_get_home_dir (), dir, NULL); - l = ephy_file_find (path, filename, 4); + l = ephy_file_find (path, filename, max_depth); g_free (path); if (l) @@ -539,11 +540,11 @@ cmd_bookmarks_import (GtkAction *action, gtk_widget_show (menu); add_bookmarks_source_menu (menu, _("Mozilla bookmarks"), - MOZILLA_BOOKMARKS_DIR, "bookmarks.html"); + MOZILLA_BOOKMARKS_DIR, "bookmarks.html", 4); add_bookmarks_source_menu (menu, _("Galeon bookmarks"), - GALEON_BOOKMARKS_DIR, "bookmarks.xbel"); + GALEON_BOOKMARKS_DIR, "bookmarks.xbel", 0); add_bookmarks_source_menu (menu, _("Konqueror bookmarks"), - KDE_BOOKMARKS_DIR, "bookmarks.xml"); + KDE_BOOKMARKS_DIR, "bookmarks.xml", 0); option_menu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); -- cgit v1.2.3