aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2004-02-28 07:34:16 +0800
committerXan Lopez <xan@src.gnome.org>2004-02-28 07:34:16 +0800
commit86636557589b2102a506aea689c3f06a646dbcfe (patch)
tree8ec8aadfd04cd8fbc0dcdbc6151d6dcf992e7d9e
parent78fc10863afdecaee83eaa18c9766fffd5dd9e23 (diff)
downloadgsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar.gz
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar.bz2
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar.lz
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar.xz
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.tar.zst
gsoc2013-epiphany-86636557589b2102a506aea689c3f06a646dbcfe.zip
Add missing check for Firebird bookmarks, patch by André Dahlqvist.
Add missing check for Firebird bookmarks, patch by André Dahlqvist.
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7aed6efc4..03c5406e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-28 Xan Lopez <xan@gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import):
+
+ Add missing check for Firebird bookmarks, patch by André Dahlqvist.
+
2004-02-27 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/MozDownload.cpp:
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 0b0eecfa1..5395d625c 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -104,7 +104,8 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
{
return ephy_bookmarks_import_xbel (bookmarks, filename);
}
- else if (strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL)
+ else if (strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL ||
+ strstr (filename, FIREBIRD_BOOKMARKS_DIR) != NULL)
{
return ephy_bookmarks_import_mozilla (bookmarks, filename);
}