diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-06-09 05:42:26 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-06-09 05:42:26 +0800 |
| commit | 4638f475184f14b5a299ed45882bad19afe62f2b (patch) | |
| tree | 8a7c8bf5761ca9b4317353544b144cb2d44d31ed | |
| parent | 5abcc556b645beba4cf15d7548e9ba94bcdbe2b6 (diff) | |
| download | gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar.gz gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar.bz2 gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar.lz gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar.xz gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.tar.zst gsoc2013-epiphany-4638f475184f14b5a299ed45882bad19afe62f2b.zip | |
Check for firefox dot-dir too.
2004-06-08 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import):
* src/bookmarks/ephy-bookmarks-import.h:
Check for firefox dot-dir too.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-import.c | 3 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-import.h | 1 |
4 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2004-06-08 Christian Persch <chpe@cvs.gnome.org> + + * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import): + * src/bookmarks/ephy-bookmarks-import.h: + + Check for firefox dot-dir too. + 2004-06-08 Marco Pesenti Gritti <marco@gnome.org> * data/default-prefs.js: @@ -4,7 +4,8 @@ Epiphany 1.2.6 Code changes - * Support for mozilla 1.7rc1, 1.7 branch and trunk (Christian, Carlos Romero) + * Support for mozilla 1.7rc1, 1.7rc2, 17rc3, 1.7 branch and trunk + (Christian, Marco, Carlos Romero) * Eliminate external protocol handlers and use prefs instead (Christian Biesinger) * Various solaris portability fixes (Brian Cameron, Christian) * Filter unwanted urls from history (Christian) [#142143] @@ -23,6 +24,7 @@ Bugfixes * Fix reload not to use forced reload by default (C. J. N. Breame) [#143365] * Fix filechooser default filename shown from web form file inputs (Christian) * Fix opening of webcal: urls (Marco) [#139040] + * Fix check for firefox bookmarks file import (Christian) Documentation diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 9bb83082e..8272455b4 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 d72d6afd3..9462067db 100644 --- a/src/bookmarks/ephy-bookmarks-import.h +++ b/src/bookmarks/ephy-bookmarks-import.h @@ -25,6 +25,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" |