diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2003-09-03 19:31:07 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-09-03 19:31:07 +0800 |
| commit | 90b92dab6b239d3ba9d74e272035db767a2943d4 (patch) | |
| tree | 55e7baf87dfd7574c3756537714656acbfc7af63 /src/bookmarks | |
| parent | 2819986f63f220eab9d7855f49272704b17736fd (diff) | |
| download | gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar.gz gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar.bz2 gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar.lz gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar.xz gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.tar.zst gsoc2013-epiphany-90b92dab6b239d3ba9d74e272035db767a2943d4.zip | |
Fix galeon bookmarks import for the case of there existing a subdirectory
2003-09-03 Christian Persch <chpe@cvs.gnome.org>
* 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.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 11 |
1 files changed, 6 insertions, 5 deletions
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); |