[epiphany/wip/bookmarks: 309/315] Remove obsolete bookmarks import/export code



commit f3bbe533334161a7344b4548e96f048b7afa4ef8
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Tue Sep 27 18:59:22 2016 +0300

    Remove obsolete bookmarks import/export code

 src/bookmarks/Makefile.am             |    4 -
 src/bookmarks/ephy-bookmarks-export.c |  492 -------------------
 src/bookmarks/ephy-bookmarks-export.h |   31 --
 src/bookmarks/ephy-bookmarks-import.c |  851 ---------------------------------
 src/bookmarks/ephy-bookmarks-import.h |   45 --
 src/bookmarks/ephy-bookmarks.c        |   13 -
 src/ephy-shell.c                      |    1 -
 7 files changed, 0 insertions(+), 1437 deletions(-)
---
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index a9b26e7..0e3a59c 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -8,10 +8,6 @@ libephybookmarks_la_SOURCES =          \
        ephy-bookmarks.h                \
        ephy-bookmark-action.c          \
        ephy-bookmark-action.h          \
-       ephy-bookmarks-export.c         \
-       ephy-bookmarks-export.h         \
-       ephy-bookmarks-import.c         \
-       ephy-bookmarks-import.h         \
        ephy-bookmarks-ui.c             \
        ephy-bookmarks-ui.h             \
        ephy-bookmark-properties.c      \
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index cdbec7f..ad083e2 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -21,8 +21,6 @@
 #include "ephy-bookmarks.h"
 
 #include "ephy-bookmark-properties.h"
-#include "ephy-bookmarks-export.h"
-#include "ephy-bookmarks-import.h"
 #include "ephy-bookmarks-type-builtins.h"
 #include "ephy-debug.h"
 #include "ephy-embed-shell.h"
@@ -111,8 +109,6 @@ ephy_bookmarks_init_defaults (EphyBookmarks *eb)
   for (i = 0; i < G_N_ELEMENTS (default_topics); i++) {
     ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
   }
-
-  ephy_bookmarks_import_rdf (eb, PKGDATADIR "/default-bookmarks.rdf");
 }
 
 static void
@@ -161,9 +157,6 @@ ephy_bookmarks_save (EphyBookmarks *eb)
     eb->keywords, (EphyNodeFilterFunc)save_filter, eb,
     eb->bookmarks, (EphyNodeFilterFunc)save_filter_local, eb,
     NULL);
-
-  /* Export bookmarks in rdf */
-  ephy_bookmarks_export_rdf (eb, eb->rdf_file);
 }
 
 static gboolean
@@ -935,12 +928,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
                eb->xml_file, eb->rdf_file);
 
     backup_file (eb->xml_file, "xml");
-
-    if (ephy_bookmarks_import_rdf (eb, eb->rdf_file) == FALSE) {
-      backup_file (eb->rdf_file, "rdf");
-
-      eb->init_defaults = TRUE;
-    }
   }
 
   if (eb->init_defaults) {
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 95fe677..161bbd3 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "ephy-shell.h"
 
-#include "ephy-bookmarks-import.h"
 #include "ephy-debug.h"
 #include "ephy-downloads-manager.h"
 #include "ephy-embed-container.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]