[tepl] Remove TeplMetadataManager, superseded by TeplMetadataStore



commit 7ae3b54375b5373afecf8e12733fad3dabed8ae2
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 2 12:23:46 2020 +0200

    Remove TeplMetadataManager, superseded by TeplMetadataStore
    
    This permits to get rid of the libxml2 dependency! Yay! (But
    GtkSourceView still depends on the libxml2).

 docs/reference/api-breaks.xml    |   7 +
 docs/reference/tepl-docs.xml     |   1 -
 docs/reference/tepl-sections.txt |   6 -
 meson.build                      |   1 -
 po/POTFILES.in                   |   1 -
 tepl/meson.build                 |   2 -
 tepl/tepl-init.c                 |  11 +-
 tepl/tepl-metadata-manager.c     | 623 ---------------------------------------
 tepl/tepl-metadata-manager.h     |  48 ---
 tepl/tepl.h                      |   1 -
 10 files changed, 10 insertions(+), 691 deletions(-)
---
diff --git a/docs/reference/api-breaks.xml b/docs/reference/api-breaks.xml
index aa3905c..4e39a12 100644
--- a/docs/reference/api-breaks.xml
+++ b/docs/reference/api-breaks.xml
@@ -146,6 +146,13 @@
           implementation detail).
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <code>tepl_metadata_manager*()</code> functions have been removed,
+          they are superseded by
+          <link linkend="TeplMetadataStore">TeplMetadataStore</link>.
+        </para>
+      </listitem>
     </itemizedlist>
   </chapter>
 </part>
diff --git a/docs/reference/tepl-docs.xml b/docs/reference/tepl-docs.xml
index 37e104a..9857b3e 100644
--- a/docs/reference/tepl-docs.xml
+++ b/docs/reference/tepl-docs.xml
@@ -47,7 +47,6 @@
       <xi:include href="xml/file-loader.xml"/>
       <xi:include href="xml/file-saver.xml"/>
       <xi:include href="xml/file-metadata.xml"/>
-      <xi:include href="xml/metadata-manager.xml"/>
       <xi:include href="xml/metadata-store.xml"/>
       <xi:include href="xml/io-error-info-bars.xml"/>
     </chapter>
diff --git a/docs/reference/tepl-sections.txt b/docs/reference/tepl-sections.txt
index 810272a..736dce8 100644
--- a/docs/reference/tepl-sections.txt
+++ b/docs/reference/tepl-sections.txt
@@ -305,12 +305,6 @@ tepl_iter_get_line_indentation
 tepl_menu_shell_append_edit_actions
 </SECTION>
 
-<SECTION>
-<FILE>metadata-manager</FILE>
-tepl_metadata_manager_init
-tepl_metadata_manager_shutdown
-</SECTION>
-
 <SECTION>
 <FILE>metadata-store</FILE>
 TeplMetadataStore
diff --git a/meson.build b/meson.build
index 1dee544..b418888 100644
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,6 @@ TEPL_PUBLIC_DEPS = [
   dependency('amtk-5', version: '>= 5.0')
 ]
 TEPL_PRIVATE_DEPS = [
-  dependency('libxml-2.0', version: '>= 2.5'),
   dependency('uchardet')
 ]
 TEPL_DEPS = [TEPL_PUBLIC_DEPS, TEPL_PRIVATE_DEPS]
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ef7a349..8dc1422 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,6 @@ tepl/tepl-init.c
 tepl/tepl-io-error-info-bars.c
 tepl/tepl-iter.c
 tepl/tepl-menu-shell.c
-tepl/tepl-metadata-manager.c
 tepl/tepl-metadata-store.c
 tepl/tepl-notebook.c
 tepl/tepl-signal-group.c
diff --git a/tepl/meson.build b/tepl/meson.build
index 345e0bc..2d52d70 100644
--- a/tepl/meson.build
+++ b/tepl/meson.build
@@ -17,7 +17,6 @@ tepl_public_headers = [
   'tepl-io-error-info-bars.h',
   'tepl-iter.h',
   'tepl-menu-shell.h',
-  'tepl-metadata-manager.h',
   'tepl-metadata-store.h',
   'tepl-notebook.h',
   'tepl-tab.h',
@@ -45,7 +44,6 @@ tepl_public_c_files = [
   'tepl-io-error-info-bars.c',
   'tepl-iter.c',
   'tepl-menu-shell.c',
-  'tepl-metadata-manager.c',
   'tepl-metadata-store.c',
   'tepl-notebook.c',
   'tepl-tab.c',
diff --git a/tepl/tepl-init.c b/tepl/tepl-init.c
index 1b11d9c..64d41da 100644
--- a/tepl/tepl-init.c
+++ b/tepl/tepl-init.c
@@ -21,7 +21,6 @@
 #include <amtk/amtk.h>
 #include <gtksourceview/gtksource.h>
 #include "tepl-abstract-factory.h"
-#include "tepl-metadata-manager.h"
 #include "tepl-metadata-store.h"
 
 /**
@@ -47,16 +46,13 @@ tepl_init (void)
  * tepl_finalize:
  *
  * Free the resources allocated by Tepl. For example it unrefs the singleton
- * objects. It also properly shutdowns the metadata manager by calling
- * tepl_metadata_manager_shutdown().
+ * objects.
  *
  * This function also calls amtk_finalize() and gtk_source_finalize().
  *
  * It is not mandatory to call this function, it's just to be friendlier to
- * memory debugging tools (but if you don't call this function and you use the
- * metadata manager, you should call tepl_metadata_manager_shutdown()). This
- * function is meant to be called at the end of main(). It can be called several
- * times.
+ * memory debugging tools. This function is meant to be called at the end of
+ * main(). It can be called several times.
  *
  * Since: 3.0
  */
@@ -79,7 +75,6 @@ tepl_finalize (void)
 
        if (!done)
        {
-               tepl_metadata_manager_shutdown ();
                _tepl_metadata_store_unref_singleton ();
                _tepl_abstract_factory_unref_singleton ();
 
diff --git a/tepl/tepl.h b/tepl/tepl.h
index 95d7c43..d9e59d0 100644
--- a/tepl/tepl.h
+++ b/tepl/tepl.h
@@ -43,7 +43,6 @@
 #include <tepl/tepl-io-error-info-bars.h>
 #include <tepl/tepl-iter.h>
 #include <tepl/tepl-menu-shell.h>
-#include <tepl/tepl-metadata-manager.h>
 #include <tepl/tepl-metadata-store.h>
 #include <tepl/tepl-notebook.h>
 #include <tepl/tepl-tab.h>


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