aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-import.h7
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b28ff6423..61bdb147c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-27 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import):
+ * src/bookmarks/ephy-bookmarks-import.h:
+
+ Offer to import from Firebird too.
+
2003-09-27 Marco Pesenti Gritti <marco@gnome.org>
* lib/ephy-gui.c: (ephy_gui_get_pixbuf_from_mime_type):
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index f1260656c..27b8cca71 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -559,6 +559,8 @@ cmd_bookmarks_import (GtkAction *action,
add_bookmarks_source_menu (menu, _("Mozilla bookmarks"),
MOZILLA_BOOKMARKS_DIR, "bookmarks.html", 4);
+ add_bookmarks_source_menu (menu, _("Firebird bookmarks"),
+ FIREBIRD_BOOKMARKS_DIR, "bookmarks.html", 4);
add_bookmarks_source_menu (menu, _("Galeon bookmarks"),
GALEON_BOOKMARKS_DIR, "bookmarks.xbel", 0);
add_bookmarks_source_menu (menu, _("Konqueror bookmarks"),
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index d4b75ccc9..d72d6afd3 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -23,9 +23,10 @@
G_BEGIN_DECLS
-#define MOZILLA_BOOKMARKS_DIR ".mozilla"
-#define GALEON_BOOKMARKS_DIR ".galeon"
-#define KDE_BOOKMARKS_DIR ".kde/share/apps/konqueror"
+#define MOZILLA_BOOKMARKS_DIR ".mozilla"
+#define FIREBIRD_BOOKMARKS_DIR ".phoenix"
+#define GALEON_BOOKMARKS_DIR ".galeon"
+#define KDE_BOOKMARKS_DIR ".kde/share/apps/konqueror"
gboolean ephy_bookmarks_import (EphyBookmarks *bookmarks,
const char *filename);