From 86636557589b2102a506aea689c3f06a646dbcfe Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Fri, 27 Feb 2004 23:34:16 +0000 Subject: Add missing check for Firebird bookmarks, patch by André Dahlqvist. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing check for Firebird bookmarks, patch by André Dahlqvist. --- ChangeLog | 6 ++++++ src/bookmarks/ephy-bookmarks-import.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7aed6efc4..03c5406e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-28 Xan Lopez + + * 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 * 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); } -- cgit