aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a8cdae7b..d50692750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-21 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import):
+
+ Allow importing from Epiphany bookmarks format (RDF),
+ fixes bug #144699.
+
2004-06-21 Adam Hooper <adamh@cvs.gnome.org>
* lib/ephy-marshal.list:
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 8272455b4..615463f59 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -104,6 +104,10 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
{
return ephy_bookmarks_import_xbel (bookmarks, filename);
}
+ else if (strcmp (type, "text/rdf") == 0)
+ {
+ return ephy_bookmarks_import_rdf (bookmarks, filename);
+ }
else if (strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL ||
strstr (filename, FIREBIRD_BOOKMARKS_DIR) != NULL ||
strstr (filename, FIREFOX_BOOKMARKS_DIR) != NULL)