[tracker/api-cleanup: 6/16] libtracker-miner: Move TrackerStorage to libtracker-common
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/api-cleanup: 6/16] libtracker-miner: Move TrackerStorage to libtracker-common
- Date: Thu, 20 Feb 2014 01:08:28 +0000 (UTC)
commit 7f0a7d2da2c33d4c8a9a63703a6e4d411cfd04dd
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Feb 20 00:24:00 2014 +0100
libtracker-miner: Move TrackerStorage to libtracker-common
This is used in a variety of places (tracker-writeback, TrackerMinerFiles,
and TrackerDecorator), but it doesn't make sense to have that exposed in
libtracker-miner, so move to libtracker-common, where it can be used in a
private manner.
.../libtracker-miner/libtracker-miner-docs.sgml | 3 +-
.../libtracker-miner/libtracker-miner-sections.txt | 24 --------------------
src/libtracker-common/Makefile.am | 2 +
src/libtracker-common/tracker-common.h | 1 +
.../tracker-storage.c | 0
.../tracker-storage.h | 0
src/libtracker-miner/Makefile.am | 7 +----
src/libtracker-miner/tracker-decorator-fs.c | 2 +-
src/libtracker-miner/tracker-miner.h | 1 -
src/miners/fs/tracker-miner-files.c | 1 +
10 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
b/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
index c8088e9..3d7e2bd 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
+++ b/docs/reference/libtracker-miner/libtracker-miner-docs.sgml
@@ -55,8 +55,7 @@
<chapter>
<title>Utilities</title>
- <xi:include href="xml/tracker-miner-enums.xml"/>
- <xi:include href="xml/tracker-storage.xml"/>
+ <xi:include href="xml/tracker-miner-enums.xml"/>
</chapter>
</part>
diff --git a/docs/reference/libtracker-miner/libtracker-miner-sections.txt
b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
index 44f47f9..d34ba11 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-sections.txt
+++ b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
@@ -229,30 +229,6 @@ tracker_password_provider_get_type
</SECTION>
<SECTION>
-<FILE>tracker-storage</FILE>
-<TITLE>TrackerStorage</TITLE>
-TrackerStorage
-TrackerStorageClass
-TrackerStorageType
-tracker_storage_get_device_roots
-tracker_storage_get_device_uuids
-tracker_storage_get_mount_point_for_uuid
-tracker_storage_get_type_for_uuid
-tracker_storage_get_uuid_for_file
-tracker_storage_new
-<SUBSECTION Standard>
-TRACKER_IS_STORAGE
-TRACKER_IS_STORAGE_CLASS
-TRACKER_STORAGE
-TRACKER_STORAGE_CLASS
-TRACKER_STORAGE_GET_CLASS
-TRACKER_STORAGE_TYPE_IS_OPTICAL
-TRACKER_STORAGE_TYPE_IS_REMOVABLE
-TRACKER_TYPE_STORAGE
-tracker_storage_get_type
-</SECTION>
-
-<SECTION>
<FILE>tracker-decorator</FILE>
<TITLE>TrackerDecorator</TITLE>
TrackerDecorator
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 69b9ce1..da761f9 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -26,6 +26,7 @@ libtracker_common_la_SOURCES = \
tracker-keyfile-object.c \
tracker-log.c \
tracker-sched.c \
+ tracker-storage.c \
tracker-type-utils.c \
tracker-utils.c \
tracker-crc32.c \
@@ -44,6 +45,7 @@ noinst_HEADERS = \
tracker-keyfile-object.h \
tracker-ontologies.h \
tracker-sched.h \
+ tracker-storage.h \
tracker-type-utils.h \
tracker-utils.h \
tracker-crc32.h \
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index e5616b0..502f895 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -39,6 +39,7 @@
#include "tracker-ontologies.h"
#include "tracker-os-dependant.h"
#include "tracker-sched.h"
+#include "tracker-storage.h"
#include "tracker-type-utils.h"
#include "tracker-utils.h"
#include "tracker-locale.h"
diff --git a/src/libtracker-miner/tracker-storage.c b/src/libtracker-common/tracker-storage.c
similarity index 100%
rename from src/libtracker-miner/tracker-storage.c
rename to src/libtracker-common/tracker-storage.c
diff --git a/src/libtracker-miner/tracker-storage.h b/src/libtracker-common/tracker-storage.h
similarity index 100%
rename from src/libtracker-miner/tracker-storage.h
rename to src/libtracker-common/tracker-storage.h
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 9307510..cd10352 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -51,8 +51,6 @@ private_sources = \
tracker-task-pool.c \
tracker-sparql-buffer.h \
tracker-sparql-buffer.c \
- tracker-storage.c \
- tracker-storage.h \
tracker-thumbnailer.c \
tracker-thumbnailer.h
@@ -104,8 +102,7 @@ libtracker_minerinclude_HEADERS = \
tracker-miner-manager.h \
tracker-miner-web.h \
tracker-network-provider.h \
- tracker-password-provider.h \
- tracker-storage.h
+ tracker-password-provider.h
libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -113,7 +110,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|crawler|storage|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
+ -export-symbols-regex
'^tracker_(miner|crawler|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
endif
libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \
diff --git a/src/libtracker-miner/tracker-decorator-fs.c b/src/libtracker-miner/tracker-decorator-fs.c
index 8812aaa..95c3e5a 100644
--- a/src/libtracker-miner/tracker-decorator-fs.c
+++ b/src/libtracker-miner/tracker-decorator-fs.c
@@ -21,7 +21,7 @@
#include <glib.h>
#include <libtracker-common/tracker-ontologies.h>
-#include <libtracker-miner/tracker-storage.h>
+#include <libtracker-common/tracker-storage.h>
#include "tracker-decorator-fs.h"
#include "tracker-decorator-internal.h"
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index d237529..5fc3793 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -25,7 +25,6 @@
#include <libtracker-miner/tracker-crawler.h>
#include <libtracker-miner/tracker-decorator.h>
#include <libtracker-miner/tracker-decorator-fs.h>
-#include <libtracker-miner/tracker-storage.h>
#include <libtracker-miner/tracker-network-provider.h>
#include <libtracker-miner/tracker-password-provider.h>
#include <libtracker-miner/tracker-miner-object.h>
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index e103dcb..dd14536 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -39,6 +39,7 @@
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-storage.h>
#include <libtracker-data/tracker-db-manager.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]