Remove files inadvertently added in previous commit

1 files changed, 0 insertions, 853 deletions

diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
deleted file mode 100644
index a196b96ea..000000000
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ /dev/null
@@ -1,853 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- *  Copyright © 2003, 2004 Marco Pesenti Gritti
- *  Copyright © 2003, 2004, 2005 Christian Persch
- *
- *  This file is part of Epiphany.
- *
- *  Epiphany is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Epiphany is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Epiphany.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include "ephy-bookmarks-import.h"
-
-#include "ephy-debug.h"
-#include "ephy-prefs.h"
-#include "ephy-settings.h"
-
-#include <gio/gio.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libxml/HTMLtree.h>
-#include <libxml/xmlreader.h>
-#include <string.h>
-
-/**
- * NSItemType: netscape bookmark item type
- */
-typedef enum {
-  NS_SITE,
-  NS_NOTES,
-  NS_FOLDER,
-  NS_FOLDER_END,
-  NS_SEPARATOR,
-  NS_UNKNOWN
-} NSItemType;
-
-static EphyNode *
-bookmark_add (EphyBookmarks *bookmarks,
-              const char    *title,
-              const char    *address)
-{
-  if (!ephy_bookmarks_find_bookmark (bookmarks, address)) {
-    return ephy_bookmarks_add (bookmarks, title, address);
-  } else {
-    return NULL;
-  }
-}
-
-gboolean
-ephy_bookmarks_import (EphyBookmarks *bookmarks,
-                       const char    *filename)
-{
-  const char *type;
-  char *basename;
-  gboolean success = FALSE;
-  GFile *file;
-  GFileInfo *file_info;
-
-  if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-                              EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
-    return FALSE;
-
-  g_return_val_if_fail (filename != NULL, FALSE);
-
-  file = g_file_new_for_path (filename);
-  file_info = g_file_query_info (file,
-                                 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                 0, NULL, NULL);
-  type = g_file_info_get_content_type (file_info);
-
-  g_debug ("Importing bookmarks of type %s", type ? type : "(null)");
-
-  if (type != NULL && (strcmp (type, "application/rdf+xml") == 0 ||
-                       strcmp (type, "text/rdf") == 0)) {
-    success = ephy_bookmarks_import_rdf (bookmarks, filename);
-  } else if ((type != NULL && strcmp (type, "application/x-xbel") == 0) ||
-             strstr (filename, GALEON_BOOKMARKS_DIR) != NULL ||
-             strstr (filename, KDE_BOOKMARKS_DIR) != NULL) {
-    success = ephy_bookmarks_import_xbel (bookmarks, filename);
-  } else if ((type != NULL && strcmp (type, "application/x-mozilla-bookmarks") == 0) ||
-             (type != NULL && strcmp (type, "text/html") == 0) ||
-             strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL ||
-             strstr (filename, FIREFOX_BOOKMARKS_DIR_0) != NULL ||
-             strstr (filename, FIREFOX_BOOKMARKS_DIR_1) != NULL ||
-             strstr (filename, FIREFOX_BOOKMARKS_DIR_2) != NULL) {
-    success = ephy_bookmarks_import_mozilla (bookmarks, filename);
-  } else if (type == NULL) {
-    basename = g_file_get_basename (file);
-
-    if (g_str_has_suffix (basename, ".rdf")) {
-      success = ephy_bookmarks_import_rdf (bookmarks, filename);
-    } else if (g_str_has_suffix (basename, ".xbel")) {
-      success = ephy_bookmarks_import_xbel (bookmarks, filename);
-    } else if (g_str_has_suffix (basename, ".html")) {
-      success = ephy_bookmarks_import_mozilla (bookmarks, filename);
-    } else {
-      /* else FIXME: put up some UI to warn user about unrecognised format? */
-      g_warning ("Couldn't determine the type of the bookmarks file %s!\n", filename);
-    }
-
-    g_free (basename);
-  }
-
-  g_object_unref (file_info);
-  g_object_unref (file);
-
-  return success;
-}
-
-/* XBEL import */
-
-typedef enum {
-  STATE_START,
-  STATE_STOP,
-  STATE_XBEL,
-  STATE_FOLDER,
-  STATE_BOOKMARK,
-  STATE_TITLE,
-  STATE_DESC,
-  STATE_INFO,
-  STATE_METADATA,
-  STATE_SMARTURL
-} EphyXBELImporterState;
-
-static int
-xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_node)
-{
-  EphyXBELImporterState state = STATE_BOOKMARK;
-  EphyNode *node;
-  xmlChar *title = NULL;
-  xmlChar *address = NULL;
-  int ret = 1;
-
-  while (ret == 1) {
-    const xmlChar *tag;
-    xmlReaderTypes type;
-
-    tag = xmlTextReaderConstName (reader);
-    g_return_val_if_fail (tag != NULL, ret);
-
-    type = xmlTextReaderNodeType (reader);
-
-    if (xmlStrEqual (tag, (xmlChar *)"#text")) {
-      if (state == STATE_TITLE && title == NULL) {
-        title = xmlTextReaderValue (reader);
-      } else if (state == STATE_SMARTURL) {
-        xmlFree (address);
-        address = xmlTextReaderValue (reader);
-      } else {
-        /* eat it */
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"bookmark")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK && address == NULL) {
-        address = xmlTextReaderGetAttribute (reader, (xmlChar *)"href");
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_BOOKMARK) {
-        /* we're done */
-
-        break;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"title")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK && title == NULL) {
-        state = STATE_TITLE;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_TITLE) {
-        state = STATE_BOOKMARK;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"desc")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK) {
-        state = STATE_DESC;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_DESC) {
-        state = STATE_BOOKMARK;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"info")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK) {
-        state = STATE_INFO;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_INFO) {
-        state = STATE_BOOKMARK;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"metadata")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_INFO) {
-        state = STATE_METADATA;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_METADATA) {
-        state = STATE_INFO;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"smarturl")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_METADATA) {
-        state = STATE_SMARTURL;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_SMARTURL) {
-        state = STATE_METADATA;
-      }
-    }
-
-    /* next one, please */
-    ret = xmlTextReaderRead (reader);
-  }
-
-  if (address == NULL) {
-    return ret;
-  }
-
-  if (title == NULL) {
-    title = xmlStrdup ((xmlChar *)_("Untitled"));
-  }
-
-  node = bookmark_add (eb, (const char *)title, (const char *)address);
-  if (node == NULL) {
-    /* probably a duplicate */
-    node = ephy_bookmarks_find_bookmark (eb, (const char *)address);
-  }
-
-  xmlFree (title);
-  xmlFree (address);
-
-  *ret_node = node;
-
-  return ret;
-}
-
-static int
-xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, GList *folders)
-{
-  EphyXBELImporterState state = STATE_FOLDER;
-  char *folder = NULL;
-  int ret;
-
-  ret = xmlTextReaderRead (reader);
-
-  while (ret == 1) {
-    const xmlChar *tag;
-    xmlReaderTypes type;
-
-    tag = xmlTextReaderConstName (reader);
-    type = xmlTextReaderNodeType (reader);
-
-    if (tag == NULL) {
-      /* shouldn't happen but does anyway :) */
-    } else if (xmlStrEqual (tag, (xmlChar *)"#text")) {
-      if (state == STATE_TITLE && folder == NULL) {
-        folder = (char *)xmlTextReaderValue (reader);
-
-        folders = g_list_prepend (folders, folder);
-      } else {
-        /* eat it */
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"bookmark") && type == 1 && state == STATE_FOLDER) {
-      EphyNode *node = NULL, *keyword;
-      GList *l;
-
-      ret = xbel_parse_bookmark (eb, reader, &node);
-
-      for (l = folders; l != NULL; l = l->next) {
-        const char *title;
-
-        title = l->data ? (char *)l->data : "";
-
-        keyword = ephy_bookmarks_find_keyword (eb, title, FALSE);
-
-        if (keyword == NULL && title[0] != '\0') {
-          keyword = ephy_bookmarks_add_keyword (eb, title);
-        }
-
-        if (node != NULL && keyword != NULL) {
-          ephy_bookmarks_set_keyword (eb, keyword, node);
-        }
-      }
-
-      if (ret != 1) break;
-    } else if ((xmlStrEqual (tag, (xmlChar *)"folder"))
-               && state == STATE_FOLDER) {
-      if (type == XML_READER_TYPE_ELEMENT) {
-        ret = xbel_parse_folder (eb, reader, folders);
-
-        if (ret != 1) break;
-      } else if (type == XML_READER_TYPE_END_ELEMENT) {
-        /* we're done */
-
-        break;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"title")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER) {
-        state = STATE_TITLE;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_TITLE) {
-        state = STATE_FOLDER;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"info")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER) {
-        state = STATE_INFO;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_INFO) {
-        state = STATE_FOLDER;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"desc")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER) {
-        state = STATE_DESC;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_DESC) {
-        state = STATE_FOLDER;
-      }
-    } else {
-      /* eat it */
-    }
-
-    /* next one, please */
-    ret = xmlTextReaderRead (reader);
-  }
-
-  if (folder) {
-    folders = g_list_remove (folders, folder);
-    g_free (folder);
-  }
-
-  return ret;
-}
-
-static int
-xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
-{
-  EphyXBELImporterState state = STATE_XBEL;
-  int ret;
-
-  ret = xmlTextReaderRead (reader);
-
-  while (ret == 1 && state != STATE_STOP) {
-    const xmlChar *tag;
-    xmlReaderTypes type;
-
-    tag = xmlTextReaderConstName (reader);
-    type = xmlTextReaderNodeType (reader);
-
-    if (tag == NULL) {
-      /* shouldn't happen but does anyway :( */
-    } else if (xmlStrEqual (tag, (xmlChar *)"bookmark") && type == XML_READER_TYPE_ELEMENT
-               && state == STATE_XBEL) {
-      EphyNode *node = NULL;
-
-      /* this will eat the </bookmark> too */
-      ret = xbel_parse_bookmark (eb, reader, &node);
-
-      if (ret != 1) break;
-    } else if (xmlStrEqual (tag, (xmlChar *)"folder") && type == XML_READER_TYPE_ELEMENT
-               && state == STATE_XBEL) {
-      /* this will eat the </folder> too */
-      ret = xbel_parse_folder (eb, reader, NULL);
-
-      if (ret != 1) break;
-    } else if ((xmlStrEqual (tag, (xmlChar *)"xbel")) && type == XML_READER_TYPE_ELEMENT
-               && state == STATE_START) {
-      state = STATE_XBEL;
-    } else if ((xmlStrEqual (tag, (xmlChar *)"xbel")) && type == XML_READER_TYPE_END_ELEMENT
-               && state == STATE_XBEL) {
-      state = STATE_STOP;
-    } else if (xmlStrEqual (tag, (xmlChar *)"title")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL) {
-        state = STATE_TITLE;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_TITLE) {
-        state = STATE_XBEL;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"info")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL) {
-        state = STATE_INFO;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_INFO) {
-        state = STATE_XBEL;
-      }
-    } else if (xmlStrEqual (tag, (xmlChar *)"desc")) {
-      if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL) {
-        state = STATE_DESC;
-      } else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_DESC) {
-        state = STATE_XBEL;
-      }
-    }
-
-    /* next one, please */
-    ret = xmlTextReaderRead (reader);
-  }
-
-  return ret;
-}
-
-/* Mozilla/Netscape import */
-
-static gchar *
-gul_general_read_line_from_file (FILE *f)
-{
-  gchar *line = g_strdup ("");
-  gchar *t;
-  gchar *buf = g_new0 (gchar, 256);
-  while (!(strchr (buf, '\n') || feof (f))) {
-    if (fgets (buf, 256, f)) {
-      t = line;
-      line = g_strconcat (line, buf, NULL);
-      g_free (t);
-    }
-  }
-  g_free (buf);
-  return line;
-}
-
-/**
- * Parses a line of a mozilla/netscape bookmark file. File must be open.
- */
-/* this has been tested fairly well */
-static NSItemType
-ns_get_bookmark_item (FILE *f, GString *name, GString *url)
-{
-  char *line = NULL;
-  GRegex *regex;
-  GMatchInfo *match_info;
-  int ret = NS_UNKNOWN;
-  char *match_url = NULL;
-  char *match_name = NULL;
-
-  line = gul_general_read_line_from_file (f);
-
-  /*
-   * Regex parsing of the html file:
-   * 1. check if it's a bookmark, or a folder, or the end of a folder,
-   * note that only ONE of this things is going to happen
-   * 2. assign to the GStrings
-   * 3. return the ret val to tell our caller what we found, by default
-   * we don't know (NS_UNKWOWN).
-   */
-
-  /* check if it's a bookmark */
-  regex = g_regex_new
-            ("<a href=\"(?P<url>[^\"]*).*?>\\s*(?P<name>.*?)\\s*</a>",
-            G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY, NULL);
-  g_regex_match (regex, line, 0, &match_info);
-
-  if (g_match_info_matches (match_info)) {
-    match_url = g_match_info_fetch_named (match_info, "url");
-    match_name = g_match_info_fetch_named (match_info, "name");
-    ret = NS_SITE;
-    goto end;
-  }
-  g_match_info_free (match_info);
-  g_regex_unref (regex);
-
-  /* check if it's a folder start */
-  regex = g_regex_new ("<h3.*>(?P<name>\\w.*)</h3>",
-                       G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY, NULL);
-
-  g_regex_match (regex, line, 0, &match_info);
-  if (g_match_info_matches (match_info)) {
-    match_name = g_match_info_fetch_named (match_info, "name");
-    ret = NS_FOLDER;
-    goto end;
-  }
-  g_match_info_free (match_info);
-  g_regex_unref (regex);
-
-  /* check if it's a folder end */
-  regex = g_regex_new ("</dl>",
-                       G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY, NULL);
-
-  g_regex_match (regex, line, 0, &match_info);
-  if (g_match_info_matches (match_info)) {
-    ret = NS_FOLDER_END;
-    goto end;
-  }
-
-  /* now let's use the collected stuff */
- end:
-  /* Due to the goto we'll always have an unfreed @match_info and
-   * @regex. Note that this two free/unrefs correspond to the last
-   * if() block too.
-   */
-  g_match_info_free (match_info);
-  g_regex_unref (regex);
-
-  if (match_name) {
-    g_string_assign (name, match_name);
-    g_free (match_name);
-  }
-
-  if (match_url) {
-    g_string_assign (url, match_url);
-    g_free (match_url);
-  }
-
-  g_free (line);
-  return ret;
-}
-
-/*
- * This function replaces some weird elements
- * like &amp; &le;, etc..
- * More info : http://www.w3.org/TR/html4/charset.html#h-5.3.2
- * NOTE : We don't support &#D or &#xH.
- * Patch courtesy of Almer S. Tigelaar <almer1@dds.nl>
- *
- * NOTE: The returned string must be freed.
- */
-static char *
-ns_parse_bookmark_item (GString *string)
-{
-  char *iterator, *temp;
-  int cnt = 0;
-  GString *result = g_string_new (NULL);
-
-  g_return_val_if_fail (string != NULL, NULL);
-  g_return_val_if_fail (string->str != NULL, NULL);
-
-  iterator = string->str;
-
-  for (cnt = 0, iterator = string->str;
-       cnt <= (int)(strlen (string->str));
-       cnt++, iterator++) {
-    if (*iterator == '&') {
-      int jump = 0;
-      int i;
-
-      if (g_ascii_strncasecmp (iterator, "&amp;", 5) == 0) {
-        g_string_append_c (result, '&');
-        jump = 5;
-      } else if (g_ascii_strncasecmp (iterator, "&lt;", 4) == 0) {
-        g_string_append_c (result, '<');
-        jump = 4;
-      } else if (g_ascii_strncasecmp (iterator, "&gt;", 4) == 0) {
-        g_string_append_c (result, '>');
-        jump = 4;
-      } else if (g_ascii_strncasecmp (iterator, "&quot;", 6) == 0) {
-        g_string_append_c (result, '\"');
-        jump = 6;
-      } else {
-        /* It must be some numeric thing now */
-
-        iterator++;
-
-        if (iterator && *iterator == '#') {
-          int val;
-          char *num, *tmp;
-
-          iterator++;
-
-          val = atoi (iterator);
-
-          tmp = g_strdup_printf ("%d", val);
-          jump = strlen (tmp);
-          g_free (tmp);
-
-          num = g_strdup_printf ("%c", (char)val);
-          g_string_append (result, num);
-          g_free (num);
-        }
-      }
-
-      for (i = jump - 1; i > 0; i--) {
-        iterator++;
-        if (*iterator == '\0')
-          break;
-      }
-    } else {
-      g_string_append_c (result, *iterator);
-    }
-  }
-  temp = result->str;
-  g_string_free (result, FALSE);
-  return temp;
-}
-
-gboolean
-ephy_bookmarks_import_mozilla (EphyBookmarks *bookmarks,
-                               const char    *filename)
-{
-  FILE *bf;        /* bookmark file */
-  GString *name, *url;
-  char *parsedname;
-  GList *folders = NULL;
-  gboolean retval = TRUE;
-
-  if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-                              EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
-    return FALSE;
-
-  if (!(bf = fopen (filename, "r"))) {
-    g_warning ("Failed to open file: %s\n", filename);
-    return FALSE;
-  }
-
-  name = g_string_new (NULL);
-  url = g_string_new (NULL);
-
-  while (!feof (bf)) {
-    EphyNode *node;
-    NSItemType t;
-    t = ns_get_bookmark_item (bf, name, url);
-    switch (t) {
-      case NS_FOLDER:
-        folders = g_list_append (folders, ns_parse_bookmark_item (name));
-        break;
-      case NS_FOLDER_END:
-        if (folders) {
-          GList *last = g_list_last (folders);
-
-          /* remove last entry */
-          g_free (last->data);
-          folders = g_list_delete_link (folders, last);
-        }
-        break;
-      case NS_SITE:
-        parsedname = ns_parse_bookmark_item (name);
-
-        node = bookmark_add (bookmarks, parsedname, url->str);
-
-        if (node == NULL) {
-          node = ephy_bookmarks_find_bookmark (bookmarks, url->str);
-          if (node == NULL) {
-            g_warning ("%s: `node' is NULL", G_STRFUNC);
-            retval = FALSE;
-            goto out;
-          }
-        }
-
-        if (folders != NULL) {
-          EphyNode *keyword;
-          GList *l;
-
-          for (l = folders; l != NULL; l = l->next) {
-            keyword = ephy_bookmarks_find_keyword (bookmarks, l->data, FALSE);
-            if (keyword == NULL) {
-              keyword = ephy_bookmarks_add_keyword (bookmarks, l->data);
-            }
-
-            ephy_bookmarks_set_keyword (bookmarks, keyword, node);
-          }
-        }
-
-        g_free (parsedname);
-
-        break;
-      case NS_NOTES:
-      case NS_SEPARATOR:
-      case NS_UNKNOWN:
-      default:
-        break;
-    }
-  }
- out:
-  fclose (bf);
-  g_string_free (name, TRUE);
-  g_string_free (url, TRUE);
-
-  return retval;
-}
-
-gboolean
-ephy_bookmarks_import_xbel (EphyBookmarks *bookmarks,
-                            const char    *filename)
-{
-  xmlTextReaderPtr reader;
-  int ret;
-
-  if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-                              EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
-    return FALSE;
-
-  if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE) {
-    return FALSE;
-  }
-
-  reader = xmlNewTextReaderFilename (filename);
-  if (reader == NULL) {
-    return FALSE;
-  }
-
-  ret = xbel_parse_xbel (bookmarks, reader);
-
-  xmlFreeTextReader (reader);
-
-  return ret >= 0 ? TRUE : FALSE;
-}
-
-static void
-parse_rdf_lang_tag (xmlNode  *child,
-                    xmlChar **value,
-                    int      *best_match)
-{
-  const char * const *locales;
-  const char *this_language;
-  xmlChar *lang;
-  xmlChar *content;
-  int i;
-
-  if (*best_match == 0)
-    /* there's no way we can do better */
-    return;
-
-  content = xmlNodeGetContent (child);
-  if (!content)
-    return;
-
-  lang = xmlNodeGetLang (child);
-  if (lang == NULL) {
-    const char *translated;
-
-    translated = _((char *)content);
-    if ((char *)content != translated) {
-      /* if we have a translation for the content of the
-       * node, then we just use this */
-      if (*value) xmlFree (*value);
-      *value = (xmlChar *)g_strdup (translated);
-      *best_match = 0;
-
-      xmlFree (content);
-      return;
-    }
-
-    this_language = "C";
-  } else
-    this_language = (char *)lang;
-
-  locales = g_get_language_names ();
-
-  for (i = 0; locales[i] && i < *best_match; i++) {
-    if (!strcmp (locales[i], this_language)) {
-      /* if we've already encountered a less accurate
-       * translation, then free it */
-      if (*value) xmlFree (*value);
-
-      *value = content;
-      *best_match = i;
-
-      break;
-    }
-  }
-
-  if (lang) xmlFree (lang);
-  if (*value != content) xmlFree (content);
-}
-
-static void
-parse_rdf_item (EphyBookmarks *bookmarks,
-                xmlNodePtr     node)
-{
-  xmlChar *title = NULL;
-  int best_match_title = INT_MAX;
-  xmlChar *link = NULL;
-  int best_match_link = INT_MAX;
-  /* we consider that it's better to use a non-localized smart link than
-   * a localized link */
-  gboolean use_smartlink = FALSE;
-  xmlChar *subject = NULL;
-  GList *subjects = NULL, *l = NULL;
-  xmlNode *child;
-  EphyNode *bmk = NULL;
-
-  child = node->children;
-
-  link = xmlGetProp (node, (xmlChar *)"about");
-
-  while (child != NULL) {
-    if (xmlStrEqual (child->name, (xmlChar *)"title")) {
-      parse_rdf_lang_tag (child, &title, &best_match_title);
-    } else if (xmlStrEqual (child->name, (xmlChar *)"link") &&
-               !use_smartlink) {
-      parse_rdf_lang_tag (child, &link, &best_match_link);
-    } else if (child->ns &&
-               xmlStrEqual (child->ns->prefix, (xmlChar *)"ephy") &&
-               xmlStrEqual (child->name, (xmlChar *)"smartlink")) {
-      if (!use_smartlink) {
-        use_smartlink = TRUE;
-        best_match_link = INT_MAX;
-      }
-
-      parse_rdf_lang_tag (child, &link, &best_match_link);
-    } else if (child->ns &&
-               xmlStrEqual (child->ns->prefix, (xmlChar *)"dc") &&
-               xmlStrEqual (child->name, (xmlChar *)"subject")) {
-      subject = xmlNodeGetContent (child);
-      if (subject)
-        subjects = g_list_prepend (subjects, subject);
-    }
-
-    child = child->next;
-  }
-
-  if (link)
-    bmk = bookmark_add (bookmarks, (char *)title, (char *)link);
-
-  if (bmk) {
-    l = subjects;
-  }
-
-  for (; l != NULL; l = l->next) {
-    char *topic_name = l->data;
-    EphyNode *topic;
-
-    topic = ephy_bookmarks_find_keyword (bookmarks, topic_name, FALSE);
-
-    if (topic == NULL) {
-      topic = ephy_bookmarks_add_keyword (bookmarks, topic_name);
-    }
-
-    if (topic != NULL) {
-      ephy_bookmarks_set_keyword (bookmarks, topic, bmk);
-    }
-  }
-
-  xmlFree (title);
-  xmlFree (link);
-
-  g_list_foreach (subjects, (GFunc)xmlFree, NULL);
-  g_list_free (subjects);
-}
-
-gboolean
-ephy_bookmarks_import_rdf (EphyBookmarks *bookmarks,
-                           const char    *filename)
-{
-  xmlDocPtr doc;
-  xmlNodePtr child;
-  xmlNodePtr root;
-
-  if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-                              EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
-    return FALSE;
-
-  if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE)
-    return FALSE;
-
-  doc = xmlParseFile (filename);
-  if (doc == NULL) {
-    /* FIXME: maybe put up a warning dialogue here, because this
-     * is a severe dataloss?
-     */
-    g_warning ("Failed to re-import the bookmarks. All bookmarks lost!\n");
-    return FALSE;
-  }
-
-  root = xmlDocGetRootElement (doc);
-
-  child = root->children;
-
-  while (child != NULL) {
-    if (xmlStrEqual (child->name, (xmlChar *)"item")) {
-      parse_rdf_item (bookmarks, child);
-    }
-
-    child = child->next;
-  }
-
-  xmlFreeDoc (doc);
-
-  return TRUE;
-}