From 6c77c6b5406ee612da3708e88f48d78dd5cb2863 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 18 Mar 2004 15:34:02 +0000 Subject: Add firefox option in bookmarks import dialogue. 2004-03-18 Christian Persch * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import): * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import): * src/bookmarks/ephy-bookmarks-import.h: Add firefox option in bookmarks import dialogue. --- ChangeLog | 8 ++++++++ src/bookmarks/ephy-bookmarks-editor.c | 2 ++ src/bookmarks/ephy-bookmarks-import.c | 3 ++- src/bookmarks/ephy-bookmarks-import.h | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d6a56c170..cfacbf3da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-03-18 Christian Persch + + * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import): + * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import): + * src/bookmarks/ephy-bookmarks-import.h: + + Add firefox option in bookmarks import dialogue. + 2004-03-17 Piers Cornwell * help/C/epiphany.xml: Fix notes and tips to validate. diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 732467a0a..2f5a5d6c0 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -619,6 +619,8 @@ cmd_bookmarks_import (GtkAction *action, MOZILLA_BOOKMARKS_DIR, "bookmarks.html", 4); add_bookmarks_source (store, _("Firebird bookmarks"), FIREBIRD_BOOKMARKS_DIR, "bookmarks.html", 4); + add_bookmarks_source (store, _("Firefox bookmarks"), + FIREFOX_BOOKMARKS_DIR, "bookmarks.html", 4); add_bookmarks_source (store, _("Galeon bookmarks"), GALEON_BOOKMARKS_DIR, "bookmarks.xbel", 0); add_bookmarks_source (store, _("Konqueror bookmarks"), diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 2e033b064..129edf83a 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -105,7 +105,8 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks, return ephy_bookmarks_import_xbel (bookmarks, filename); } else if (strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL || - strstr (filename, FIREBIRD_BOOKMARKS_DIR) != NULL) + strstr (filename, FIREBIRD_BOOKMARKS_DIR) != NULL || + strstr (filename, FIREFOX_BOOKMARKS_DIR) != NULL) { return ephy_bookmarks_import_mozilla (bookmarks, filename); } diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h index 70bda36f9..8938baef7 100644 --- a/src/bookmarks/ephy-bookmarks-import.h +++ b/src/bookmarks/ephy-bookmarks-import.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS #define MOZILLA_BOOKMARKS_DIR ".mozilla" #define FIREBIRD_BOOKMARKS_DIR ".phoenix" +#define FIREFOX_BOOKMARKS_DIR ".firefox" #define GALEON_BOOKMARKS_DIR ".galeon" #define KDE_BOOKMARKS_DIR ".kde/share/apps/konqueror" -- cgit v1.2.3