aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-07 19:54:41 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-07 19:54:41 +0800
commit1b57d44cfe8ed36a245f6a31961ec67d31529262 (patch)
treeaa3819a64f9efed3649fc6d0bdeb6e08652e940a /src/bookmarks
parentec3068c56f7af999038247a4ec03be3db810a33f (diff)
downloadgsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar.gz
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar.bz2
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar.lz
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar.xz
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.tar.zst
gsoc2013-epiphany-1b57d44cfe8ed36a245f6a31961ec67d31529262.zip
Remove memory cache prefs/ui, now mozilla can deal with it automagically.
2003-06-07 Marco Pesenti Gritti <marco@it.gnome.org> * data/epiphany.schemas.in: * data/glade/prefs-dialog.glade: * embed/ephy-embed-prefs.h: * embed/ephy-embed-single.c: (ephy_embed_single_clear_cache): * embed/ephy-embed-single.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * src/bookmarks/ephy-bookmarks-import.c: (mozilla_parse_bookmarks), (xbel_parse_folder): * src/prefs-dialog.c: (prefs_clear_cache_button_clicked_cb): Remove memory cache prefs/ui, now mozilla can deal with it automagically. Rename Appeareance tab to be less generic. Do not convert spaces to _ on bookmarks importing.
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index e767ad879..950560d8f 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -29,12 +29,6 @@ typedef struct _XbelInfo
char *smarturl;
} XbelInfo;
-static char *
-build_keyword (const char *folder)
-{
- return ephy_str_replace_substring (folder, " ", "_");
-}
-
static EphyNode *
set_folder (EphyBookmarks *bookmarks,
EphyNode *bookmark,
@@ -64,12 +58,7 @@ mozilla_parse_bookmarks (EphyBookmarks *bookmarks,
{
if (xmlStrEqual (child->name, "h3"))
{
- xmlChar *tmp;
-
- tmp = xmlNodeGetContent (child);
- g_free (*keyword);
- *keyword = build_keyword (tmp);
- xmlFree (tmp);
+ *keyword = xmlNodeGetContent (child);
}
else if (xmlStrEqual (child->name, "a"))
{
@@ -140,13 +129,7 @@ xbel_parse_folder (EphyBookmarks *bookmarks,
{
if (xmlStrEqual (child->name, "title"))
{
- xmlChar *tmp;
-
- tmp = xmlNodeGetContent (child);
-
- g_free (keyword);
- keyword = build_keyword (tmp);
- xmlFree (tmp);
+ keyword = xmlNodeGetContent (child);
}
else if (xmlStrEqual (child->name, "bookmark"))
{
@@ -191,7 +174,7 @@ xbel_parse_folder (EphyBookmarks *bookmarks,
g_free (keyword);
keyword = g_strdup (default_keyword);
}
-
+
child = child->next;
}