aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks/ephy-bookmarks-import.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-28 21:14:47 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-28 21:14:47 +0800
commitc1ced24c7457d8991bc2e44c7cc784fe1215947c (patch)
tree59427b00f369dbe6f139a0187bf0c710a99c1bd9 /src/bookmarks/ephy-bookmarks-import.c
parentcc8e17fdc6434920c709ecdc8aef54ed70f9c66e (diff)
downloadgsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar.gz
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar.bz2
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar.lz
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar.xz
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.tar.zst
gsoc2013-epiphany-c1ced24c7457d8991bc2e44c7cc784fe1215947c.zip
Fallback using directories to detect format if the mime is not relevant.
2003-06-28 Marco Pesenti Gritti <marco@it.gnome.org> * configure.in: * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import): * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import): * src/bookmarks/ephy-bookmarks-import.h: Fallback using directories to detect format if the mime is not relevant.
Diffstat (limited to 'src/bookmarks/ephy-bookmarks-import.c')
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 778186039..884b856ee 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -77,10 +77,21 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
{
return ephy_bookmarks_import_mozilla (bookmarks, filename);
}
- else
+ else if (strcmp (type, "application/xbel") == 0)
{
return ephy_bookmarks_import_xbel (bookmarks, filename);
}
+ else if (strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL)
+ {
+ return ephy_bookmarks_import_mozilla (bookmarks, filename);
+ }
+ else if (strstr (filename, GALEON_BOOKMARKS_DIR) != NULL ||
+ strstr (filename, KDE_BOOKMARKS_DIR) != NULL)
+ {
+ return ephy_bookmarks_import_xbel (bookmarks, filename);
+ }
+
+ return FALSE;
}
static void