aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c3
-rw-r--r--src/bookmarks/ephy-bookmarks-import.h1
4 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d6a56c170..cfacbf3da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-18 Christian Persch <chpe@cvs.gnome.org>
+
+ * 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 <piers@gnome.org>
* 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"