aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-02-27 06:30:20 +0800
committerChristian Persch <chpe@src.gnome.org>2005-02-27 06:30:20 +0800
commit74aefa193695d7b6333703ec8539d05022c866a3 (patch)
treec214084d3759e12c7a14db712bc874bf77b7c9dc
parentfbf4b15ed54be3abfe2c3c937c50b9c623804cb5 (diff)
downloadgsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar.gz
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar.bz2
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar.lz
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar.xz
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.tar.zst
gsoc2013-epiphany-74aefa193695d7b6333703ec8539d05022c866a3.zip
Make sure folder is != NULL. Fixes bug #163341.
2005-02-26 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder): Make sure folder is != NULL. Fixes bug #163341.
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 764de7c47..3a005bc2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-02-26 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder):
+
+ Make sure folder is != NULL. Fixes bug #163341.
+
+2005-02-26 Christian Persch <chpe@cvs.gnome.org>
+
* configure.ac:
Depend on gnome-desktop for gnome-desktop-item,
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 23aa493ce..47cf97f34 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -313,9 +313,9 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
ret = xbel_parse_bookmark (eb, reader, &node);
- keyword = ephy_bookmarks_find_keyword (eb, folder, FALSE);
+ keyword = ephy_bookmarks_find_keyword (eb, folder ? folder : "", FALSE);
- if (keyword == NULL)
+ if (keyword == NULL && folder != NULL && folder[0] != '\0')
{
keyword = ephy_bookmarks_add_keyword (eb, folder);
}
@@ -332,7 +332,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
{
if (type == XML_READER_TYPE_ELEMENT)
{
- ret = xbel_parse_folder (eb, reader, folder);
+ ret = xbel_parse_folder (eb, reader, folder ? folder : "");
if (ret != 1) break;
}