[tracker/api-cleanup: 9/12] libtracker-miner: Remove TrackerMinerWeb and helper objects



commit 17108a7b3ad5d9a5e59ffa225c03078d79d8a894
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jan 29 00:06:54 2014 +0100

    libtracker-miner: Remove TrackerMinerWeb and helper objects
    
    TrackerMinerWeb vmethods are very focused on the management of
    credentials and capabilities, this is something that's been taken
    over by gnome-online-accounts since this API was added, and the
    lack of TrackerMinerWeb implementations in the wild seems to
    hint it's not been as useful as when it was initially devised,
    so farewell.

 .../libtracker-miner/libtracker-miner-docs.sgml    |    7 -
 .../libtracker-miner/libtracker-miner-sections.txt |   66 ---
 src/libtracker-miner/Makefile.am                   |   29 +-
 src/libtracker-miner/tracker-miner-web.c           |  578 --------------------
 src/libtracker-miner/tracker-miner-web.h           |  182 ------
 src/libtracker-miner/tracker-miner.h               |    3 -
 .../tracker-network-provider-dummy.c               |  168 ------
 .../tracker-network-provider-network-manager.c     |  331 -----------
 src/libtracker-miner/tracker-network-provider.c    |  151 -----
 src/libtracker-miner/tracker-network-provider.h    |  105 ----
 .../tracker-password-provider-gnome.c              |  306 -----------
 .../tracker-password-provider-keyfile.c            |  405 --------------
 src/libtracker-miner/tracker-password-provider.c   |  303 ----------
 src/libtracker-miner/tracker-password-provider.h   |  127 -----
 14 files changed, 4 insertions(+), 2757 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/libtracker-miner-docs.sgml 
b/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
index 8f7eb23..7f7e054 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
+++ b/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
@@ -31,7 +31,6 @@
     <chapter>
       <title>Base abstract miner classes</title>
       <xi:include href="xml/tracker-miner-object.xml"/>
-      <xi:include href="xml/tracker-miner-web.xml"/>
       <xi:include href="xml/tracker-miner-online.xml"/>
       <xi:include href="xml/tracker-decorator.xml"/>
     </chapter>
@@ -44,12 +43,6 @@
     </chapter>
 
     <chapter>
-      <title>Base abstract providers for network/password/etc control</title>
-      <xi:include href="xml/tracker-network-provider.xml"/>
-      <xi:include href="xml/tracker-password-provider.xml"/>
-    </chapter>
-
-    <chapter>
       <title>Utilities</title>
          <xi:include href="xml/tracker-miner-enums.xml"/>
     </chapter>
diff --git a/docs/reference/libtracker-miner/libtracker-miner-sections.txt 
b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
index f7b3b1c..d119a77 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-sections.txt
+++ b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
@@ -128,72 +128,6 @@ tracker_miner_get_type
 </SECTION>
 
 <SECTION>
-<FILE>tracker-miner-web</FILE>
-<TITLE>TrackerMinerWeb</TITLE>
-TRACKER_MINER_WEB_DBUS_INTERFACE
-TRACKER_MINER_WEB_ERROR
-TRACKER_MINER_WEB_ERROR_DOMAIN
-TrackerMinerWeb
-TrackerMinerWebClass
-TrackerMinerWebError
-tracker_miner_web_associate
-tracker_miner_web_authenticate
-tracker_miner_web_dissociate
-tracker_miner_web_error_quark
-tracker_miner_web_get_association_data
-<SUBSECTION Standard>
-TRACKER_IS_MINER_WEB
-TRACKER_IS_MINER_WEB_CLASS
-TRACKER_MINER_WEB
-TRACKER_MINER_WEB_CLASS
-TRACKER_MINER_WEB_GET_CLASS
-TRACKER_TYPE_MINER_WEB
-TrackerMinerWebPrivate
-tracker_miner_web_get_type
-</SECTION>
-
-<SECTION>
-<FILE>tracker-network-provider</FILE>
-<TITLE>TrackerNetworkProvider</TITLE>
-TrackerNetworkProvider
-TrackerNetworkProviderIface
-TrackerNetworkProviderStatus
-tracker_network_provider_get
-tracker_network_provider_get_name
-tracker_network_provider_get_status
-<SUBSECTION Standard>
-TRACKER_IS_NETWORK_PROVIDER
-TRACKER_NETWORK_PROVIDER
-TRACKER_NETWORK_PROVIDER_GET_INTERFACE
-TRACKER_TYPE_NETWORK_PROVIDER
-tracker_network_provider_get_type
-</SECTION>
-
-<SECTION>
-<FILE>tracker-password-provider</FILE>
-<TITLE>TrackerPasswordProvider</TITLE>
-TRACKER_PASSWORD_PROVIDER_ERROR
-TRACKER_PASSWORD_PROVIDER_ERROR_DOMAIN
-TrackerPasswordProvider
-TrackerPasswordProviderError
-TrackerPasswordProviderIface
-tracker_password_provider_error_quark
-tracker_password_provider_forget_password
-tracker_password_provider_get
-tracker_password_provider_get_name
-tracker_password_provider_get_password
-tracker_password_provider_lock_password
-tracker_password_provider_store_password
-tracker_password_provider_unlock_password
-<SUBSECTION Standard>
-TRACKER_IS_PASSWORD_PROVIDER
-TRACKER_PASSWORD_PROVIDER
-TRACKER_PASSWORD_PROVIDER_GET_INTERFACE
-TRACKER_TYPE_PASSWORD_PROVIDER
-tracker_password_provider_get_type
-</SECTION>
-
-<SECTION>
 <FILE>tracker-miner-online</FILE>
 <TITLE>TrackerMinerOnline</FILE>
 TrackerMinerOnline
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 36be1a2..1f4ce8d 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -63,22 +63,16 @@ miner_sources =                                    \
        tracker-miner-online.c                         \
        tracker-miner-online.h                         \
        tracker-miner-fs.c                             \
-       tracker-miner-fs.h                             \
-       tracker-miner-web.c                            \
-       tracker-miner-web.h                            
+       tracker-miner-fs.h
 
 
 libtracker_miner_private_la_SOURCES =                  \
        $(private_sources)
 
 libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES =    \
-       $(network_provider_sources)                    \
-       $(password_provider_sources)                   \
        $(miner_sources)                               \
        tracker-indexing-tree.c                        \
-       tracker-indexing-tree.h                        \
-       tracker-network-provider.c                     \
-       tracker-password-provider.c
+       tracker-indexing-tree.h
 
 libtracker_minerinclude_HEADERS =                      \
        tracker-decorator.h                            \
@@ -90,10 +84,7 @@ libtracker_minerinclude_HEADERS =                      \
        tracker-miner-enum-types.h                     \
        tracker-miner-object.h                         \
        tracker-miner-online.h                         \
-       tracker-miner-fs.h                             \
-       tracker-miner-web.h                            \
-       tracker-network-provider.h                     \
-       tracker-password-provider.h
+       tracker-miner-fs.h
 
 libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS =    \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -101,7 +92,7 @@ if !ENABLE_GCOV
 # Using enable_gcov instead of have_unit_test because when doing a release
 #  we disable gcov but NOT the unit tests
 libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS +=    \
-       -export-symbols-regex 
'^tracker_(miner|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|network_type|decorator)_.*'
+       -export-symbols-regex 
'^tracker_(miner|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|network_type|decorator)_.*'
 endif
 
 libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD =     \
@@ -112,18 +103,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD =     \
        $(BUILD_LIBS)                                  \
        $(LIBTRACKER_MINER_LIBS)
 
-if HAVE_LIBSECRET
-password_provider_sources = tracker-password-provider-gnome.c
-else
-password_provider_sources = tracker-password-provider-keyfile.c
-endif
-
-if HAVE_NETWORK_MANAGER
-network_provider_sources = tracker-network-provider-network-manager.c
-else
-network_provider_sources = tracker-network-provider-dummy.c
-endif
-
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                            \
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index cd6acc1..9c5ec64 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -24,12 +24,9 @@
 
 #include <libtracker-miner/tracker-decorator.h>
 #include <libtracker-miner/tracker-decorator-fs.h>
-#include <libtracker-miner/tracker-network-provider.h>
-#include <libtracker-miner/tracker-password-provider.h>
 #include <libtracker-miner/tracker-miner-object.h>
 #include <libtracker-miner/tracker-miner-online.h>
 #include <libtracker-miner/tracker-miner-fs.h>
-#include <libtracker-miner/tracker-miner-web.h>
 #include <libtracker-miner/tracker-miner-enums.h>
 #include <libtracker-miner/tracker-miner-enum-types.h>
 #include <libtracker-miner/tracker-indexing-tree.h>


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