[tracker] Remove marshallers
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] Remove marshallers
- Date: Mon, 13 Jan 2014 19:37:01 +0000 (UTC)
commit ff0f96f5cd10ee2d22ef629aad73a83f5d62eebe
Author: Xavier Claessens <xavier claessens collabora co uk>
Date: Fri Jan 3 12:33:36 2014 -0500
Remove marshallers
Glib >= 2.30 already hard depend on libffi.
.gitignore | 1 -
Makefile.am | 1 -
configure.ac | 3 ---
docs/reference/libtracker-miner/Makefile.am | 1 -
src/libtracker-common/Makefile.am | 14 --------------
src/libtracker-common/tracker-config-file.c | 2 +-
src/libtracker-common/tracker-marshal.list | 1 -
src/libtracker-miner/Makefile-shared-sources.decl | 6 ------
src/libtracker-miner/Makefile.am | 14 --------------
src/libtracker-miner/tracker-crawler.c | 11 +++++------
src/libtracker-miner/tracker-file-notifier.c | 15 +++++++--------
src/libtracker-miner/tracker-indexing-tree.c | 6 +++---
src/libtracker-miner/tracker-marshal.list | 16 ----------------
src/libtracker-miner/tracker-miner-fs.c | 11 +++++------
src/libtracker-miner/tracker-miner-manager.c | 11 +++++------
src/libtracker-miner/tracker-miner-object.c | 13 ++++++-------
src/libtracker-miner/tracker-monitor.c | 11 +++++------
src/libtracker-miner/tracker-network-provider.c | 2 +-
src/libtracker-miner/tracker-storage.c | 5 ++---
src/miners/fs/Makefile.am | 18 ------------------
src/miners/fs/tracker-main.c | 1 -
src/miners/fs/tracker-marshal.list | 8 --------
src/miners/fs/tracker-miner-files-index.c | 1 -
src/miners/fs/tracker-miner-files.c | 1 -
src/miners/fs/tracker-power-hal.c | 1 -
src/tracker-extract/Makefile.am | 17 -----------------
src/tracker-extract/tracker-extract.c | 1 -
src/tracker-extract/tracker-marshal.list | 1 -
src/tracker-extract/tracker-media-art.c | 1 -
src/tracker-writeback/Makefile.am | 20 --------------------
src/tracker-writeback/tracker-marshal.list | 2 --
tests/libtracker-miner/Makefile.am | 4 ----
32 files changed, 40 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f76aa0..e79df26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,4 @@ stamp-h1
tmpl
tracker-*-client.h
tracker-*-glue.h
-tracker-marshal.[ch]
tracker-preferences.[ch]
diff --git a/Makefile.am b/Makefile.am
index a0c7939..358935f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,6 @@ coverage-report: coverage
libstemmer/stem_UTF_8_* \
tracker-control/tracker-miner-files-index-client.h \
"*.vapi" \
- "tracker-marshal.*"
rm -rf $(top_builddir)/coverage
$(MKDIR_P) $(top_builddir)/coverage
genhtml --title "@PACKAGE_STRING@" --output-directory $(top_builddir)/coverage
$(top_builddir)/lcov.info
diff --git a/configure.ac b/configure.ac
index c6d12ff..5c3730b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -770,9 +770,6 @@ fi
DBUS_SERVICES_DIR="$services_dir"
AC_SUBST(DBUS_SERVICES_DIR)
-GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
-AC_SUBST(GLIB_GENMARSHAL)
-
# Introduced with GSettings
GLIB_MKENUMS=`$PKG_CONFIG glib-2.0 --variable=glib_mkenums`
AC_SUBST(GLIB_MKENUMS)
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 3d046f6..16372e7 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -27,7 +27,6 @@ IGNORE_HFILES= \
tracker-dbus.h \
tracker-file-notifier.h \
tracker-file-system.h \
- tracker-marshal.h \
tracker-miner-client.h \
tracker-miner-dbus.h \
tracker-miner-glue.h \
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index ea1b918..1ef66bf 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -73,17 +73,6 @@ if HAVE_TRACKER_FTS
libtracker_common_la_LIBADD += $(top_builddir)/src/libstemmer/libstemmer.la
endif
-marshal_sources = \
- tracker-marshal.h \
- tracker-marshal.c
-
-tracker-marshal.h: tracker-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
-
-tracker-marshal.c: tracker-marshal.list
- $(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
-
tracker-enum-types.h: tracker-enum-types.h.template $(NOINST_H_FILES)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template tracker-enum-types.h.template
$(noinst_HEADERS)) > $@
@@ -92,17 +81,14 @@ tracker-enum-types.c: tracker-enum-types.c.template $(NOINST_H_FILES)
BUILT_SOURCES = \
- $(marshal_sources) \
tracker-enum-types.c \
tracker-enum-types.h
CLEANFILES = \
- $(marshal_sources) \
tracker-enum-types.c \
tracker-enum-types.h
EXTRA_DIST = \
- tracker-marshal.list \
libtracker-common.vapi \
tracker-enum-types.c.template \
tracker-enum-types.h.template
diff --git a/src/libtracker-common/tracker-config-file.c b/src/libtracker-common/tracker-config-file.c
index 3f5f274..46d2b13 100644
--- a/src/libtracker-common/tracker-config-file.c
+++ b/src/libtracker-common/tracker-config-file.c
@@ -98,7 +98,7 @@ tracker_config_file_class_init (TrackerConfigFileClass *klass)
G_STRUCT_OFFSET (TrackerConfigFileClass, changed),
NULL,
NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0,
G_TYPE_NONE);
diff --git a/src/libtracker-miner/Makefile-shared-sources.decl
b/src/libtracker-miner/Makefile-shared-sources.decl
index 08fe72e..4cbfecf 100644
--- a/src/libtracker-miner/Makefile-shared-sources.decl
+++ b/src/libtracker-miner/Makefile-shared-sources.decl
@@ -2,12 +2,6 @@
# Includes sources that will be shared with the
# testers in test/libtracker-miner
-libtracker_miner_marshal_sources = \
- $(top_builddir)/src/libtracker-miner/tracker-marshal.c
-
-libtracker_miner_marshal_headers = \
- $(top_builddir)/src/libtracker-miner/tracker-marshal.h
-
libtracker_miner_monitor_sources = \
$(top_srcdir)/src/libtracker-miner/tracker-monitor.c
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 1aa4a21..882b8fe 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -2,8 +2,6 @@ include $(top_srcdir)/Makefile.decl
# Include list of shared sources:
# Defines:
-# $(libtracker_miner_marshal_sources)
-# $(libtracker_miner_marshal_headers)
# $(libtracker_miner_monitor_sources)
# $(libtracker_miner_monitor_headers)
# $(libtracker_miner_file_system_sources)
@@ -35,8 +33,6 @@ libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
crawler_sources = \
- $(libtracker_miner_marshal_sources) \
- $(libtracker_miner_marshal_headers) \
tracker-crawler.c \
tracker-crawler.h \
tracker-utils.c \
@@ -135,13 +131,6 @@ else
network_provider_sources = tracker-network-provider-dummy.c
endif
-$(top_builddir)/src/libtracker-miner/tracker-marshal.h: tracker-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
-
-$(top_builddir)/src/libtracker-miner/tracker-marshal.c: tracker-marshal.list
- $(AM_V_GEN)(echo "#include \"tracker-marshal.h\""; \
- $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body) > $@
-
# Vala bindings
vapidir = $(datadir)/vala/vapi
vapi_DATA = \
@@ -157,8 +146,6 @@ tracker-miner-$(TRACKER_API_VERSION).deps: tracker-miner.deps
BUILT_SOURCES = \
tracker-miner-enum-types.c \
tracker-miner-enum-types.h \
- $(libtracker_miner_marshal_sources) \
- $(libtracker_miner_marshal_headers) \
$(vapi_DATA)
CLEANFILES = $(BUILT_SOURCES)
@@ -166,7 +153,6 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
tracker-miner-enum-types.c.template \
tracker-miner-enum-types.h.template \
- tracker-marshal.list \
tracker-miner.vapi \
tracker-miner.deps
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index c034204..b73eebe 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -20,7 +20,6 @@
#include "config.h"
#include "tracker-crawler.h"
-#include "tracker-marshal.h"
#include "tracker-utils.h"
#define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER,
TrackerCrawlerPrivate))
@@ -148,7 +147,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory),
tracker_accumulator_check_file,
NULL,
- tracker_marshal_BOOLEAN__OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
1,
G_TYPE_FILE);
@@ -159,7 +158,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
G_STRUCT_OFFSET (TrackerCrawlerClass, check_file),
tracker_accumulator_check_file,
NULL,
- tracker_marshal_BOOLEAN__OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
1,
G_TYPE_FILE);
@@ -170,7 +169,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory_contents),
tracker_accumulator_check_file,
NULL,
- tracker_marshal_BOOLEAN__OBJECT_POINTER,
+ NULL,
G_TYPE_BOOLEAN,
2, G_TYPE_FILE, G_TYPE_POINTER);
signals[DIRECTORY_CRAWLED] =
@@ -179,7 +178,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerCrawlerClass, directory_crawled),
NULL, NULL,
- tracker_marshal_VOID__OBJECT_POINTER_UINT_UINT_UINT_UINT,
+ NULL,
G_TYPE_NONE,
6,
G_TYPE_FILE,
@@ -194,7 +193,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerCrawlerClass, finished),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_BOOLEAN);
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index c0051ec..9ef01aa 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -28,7 +28,6 @@
#include "tracker-file-system.h"
#include "tracker-crawler.h"
#include "tracker-monitor.h"
-#include "tracker-marshal.h"
static GQuark quark_property_crawled = 0;
static GQuark quark_property_queried = 0;
@@ -1162,7 +1161,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
file_created),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_FILE);
signals[FILE_UPDATED] =
@@ -1172,7 +1171,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
file_updated),
NULL, NULL,
- tracker_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_FILE, G_TYPE_BOOLEAN);
signals[FILE_DELETED] =
@@ -1182,7 +1181,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
file_deleted),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_FILE);
signals[FILE_MOVED] =
@@ -1192,7 +1191,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
file_moved),
NULL, NULL,
- tracker_marshal_VOID__OBJECT_OBJECT,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_FILE, G_TYPE_FILE);
signals[DIRECTORY_STARTED] =
@@ -1202,7 +1201,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
directory_started),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_FILE);
signals[DIRECTORY_FINISHED] =
@@ -1212,7 +1211,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
directory_finished),
NULL, NULL,
- tracker_marshal_VOID__OBJECT_UINT_UINT_UINT_UINT,
+ NULL,
G_TYPE_NONE,
5, G_TYPE_FILE, G_TYPE_UINT,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
@@ -1223,7 +1222,7 @@ tracker_file_notifier_class_init (TrackerFileNotifierClass *klass)
G_STRUCT_OFFSET (TrackerFileNotifierClass,
finished),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0, G_TYPE_NONE);
g_object_class_install_property (object_class,
diff --git a/src/libtracker-miner/tracker-indexing-tree.c b/src/libtracker-miner/tracker-indexing-tree.c
index 0733781..743631e 100644
--- a/src/libtracker-miner/tracker-indexing-tree.c
+++ b/src/libtracker-miner/tracker-indexing-tree.c
@@ -225,7 +225,7 @@ tracker_indexing_tree_class_init (TrackerIndexingTreeClass *klass)
G_STRUCT_OFFSET (TrackerIndexingTreeClass,
directory_added),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_FILE);
signals[DIRECTORY_REMOVED] =
g_signal_new ("directory-removed",
@@ -234,7 +234,7 @@ tracker_indexing_tree_class_init (TrackerIndexingTreeClass *klass)
G_STRUCT_OFFSET (TrackerIndexingTreeClass,
directory_removed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_FILE);
signals[DIRECTORY_UPDATED] =
g_signal_new ("directory-updated",
@@ -243,7 +243,7 @@ tracker_indexing_tree_class_init (TrackerIndexingTreeClass *klass)
G_STRUCT_OFFSET (TrackerIndexingTreeClass,
directory_updated),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_FILE);
g_type_class_add_private (object_class,
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 68a9d8e..fc7a0da 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -26,7 +26,6 @@
#include <libtracker-common/tracker-utils.h>
#include "tracker-crawler.h"
-#include "tracker-marshal.h"
#include "tracker-miner-fs.h"
#include "tracker-media-art.h"
#include "tracker-monitor.h"
@@ -402,7 +401,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerFSClass, process_file),
NULL, NULL,
- tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
3, G_TYPE_FILE, TRACKER_SPARQL_TYPE_BUILDER, G_TYPE_CANCELLABLE);
@@ -438,7 +437,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerFSClass, process_file_attributes),
NULL, NULL,
- tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
3, G_TYPE_FILE, TRACKER_SPARQL_TYPE_BUILDER, G_TYPE_CANCELLABLE);
@@ -468,7 +467,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerFSClass, ignore_next_update_file),
NULL, NULL,
- tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
3, G_TYPE_FILE, TRACKER_SPARQL_TYPE_BUILDER, G_TYPE_CANCELLABLE);
@@ -492,7 +491,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerFSClass, finished),
NULL, NULL,
- tracker_marshal_VOID__DOUBLE_UINT_UINT_UINT_UINT,
+ NULL,
G_TYPE_NONE,
5,
G_TYPE_DOUBLE,
@@ -523,7 +522,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
G_STRUCT_OFFSET (TrackerMinerFSClass, writeback_file),
NULL,
NULL,
- tracker_marshal_BOOLEAN__OBJECT_BOXED_BOXED_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
4,
G_TYPE_FILE,
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index cdd472e..ce1b79c 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -27,7 +27,6 @@
#include "tracker-crawler.h"
#include "tracker-miner-object.h"
#include "tracker-miner-manager.h"
-#include "tracker-marshal.h"
#include "tracker-miner-dbus.h"
/**
@@ -142,7 +141,7 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_progress),
NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_DOUBLE_INT,
+ NULL,
G_TYPE_NONE, 4,
G_TYPE_STRING,
G_TYPE_STRING,
@@ -164,7 +163,7 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_paused),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
/**
@@ -183,7 +182,7 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_resumed),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
/**
@@ -203,7 +202,7 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_activated),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
/**
@@ -223,7 +222,7 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_deactivated),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
diff --git a/src/libtracker-miner/tracker-miner-object.c b/src/libtracker-miner/tracker-miner-object.c
index 97ec955..9b460d4 100644
--- a/src/libtracker-miner/tracker-miner-object.c
+++ b/src/libtracker-miner/tracker-miner-object.c
@@ -26,7 +26,6 @@
#include <libtracker-common/tracker-dbus.h>
#include <libtracker-common/tracker-type-utils.h>
-#include "tracker-marshal.h"
#include "tracker-miner-object.h"
#include "tracker-miner-dbus.h"
@@ -237,7 +236,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, started),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* TrackerMiner::stopped:
@@ -255,7 +254,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, stopped),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* TrackerMiner::paused:
@@ -274,7 +273,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, paused),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* TrackerMiner::resumed:
@@ -292,7 +291,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, resumed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* TrackerMiner::progress:
@@ -317,7 +316,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, progress),
NULL, NULL,
- tracker_marshal_VOID__STRING_DOUBLE_INT,
+ NULL,
G_TYPE_NONE, 3,
G_TYPE_STRING,
G_TYPE_DOUBLE,
@@ -340,7 +339,7 @@ tracker_miner_class_init (TrackerMinerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerMinerClass, ignore_next_update),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRV);
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 2f9d7f0..327882f 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -31,7 +31,6 @@
#endif
#include "tracker-monitor.h"
-#include "tracker-marshal.h"
#define TRACKER_MONITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_MONITOR,
TrackerMonitorPrivate))
@@ -160,7 +159,7 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_OBJECT,
@@ -171,7 +170,7 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_OBJECT,
@@ -182,7 +181,7 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_OBJECT,
@@ -193,7 +192,7 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_OBJECT,
@@ -204,7 +203,7 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__OBJECT_OBJECT_BOOLEAN_BOOLEAN,
+ NULL,
G_TYPE_NONE,
4,
G_TYPE_OBJECT,
diff --git a/src/libtracker-miner/tracker-network-provider.c b/src/libtracker-miner/tracker-network-provider.c
index 561bc96..09f22f7 100644
--- a/src/libtracker-miner/tracker-network-provider.c
+++ b/src/libtracker-miner/tracker-network-provider.c
@@ -65,7 +65,7 @@ tracker_network_provider_init (gpointer object_class)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__UINT,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_UINT);
is_initialized = TRUE;
diff --git a/src/libtracker-miner/tracker-storage.c b/src/libtracker-miner/tracker-storage.c
index bbf771d..557d002 100644
--- a/src/libtracker-miner/tracker-storage.c
+++ b/src/libtracker-miner/tracker-storage.c
@@ -28,7 +28,6 @@
#include "tracker-storage.h"
#include "tracker-utils.h"
-#include "tracker-marshal.h"
/**
* SECTION:tracker-storage
@@ -114,7 +113,7 @@ tracker_storage_class_init (TrackerStorageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN,
+ NULL,
G_TYPE_NONE,
5,
G_TYPE_STRING,
@@ -129,7 +128,7 @@ tracker_storage_class_init (TrackerStorageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- tracker_marshal_VOID__STRING_STRING,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 964a4ce..e7b7471 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -69,21 +69,3 @@ tracker_miner_fs_SOURCES += \
tracker-miner-meego.cpp \
tracker-miner-meego.h
endif
-
-marshal_sources = \
- tracker-marshal.h \
- tracker-marshal.c
-
-tracker-marshal.h: tracker-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
-
-tracker-marshal.c: tracker-marshal.list
- $(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
-
-BUILT_SOURCES = \
- $(marshal_sources)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = tracker-marshal.list
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 17c67fb..41305c0 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -43,7 +43,6 @@
#include <libtracker-data/tracker-db-manager.h>
#include "tracker-config.h"
-#include "tracker-marshal.h"
#include "tracker-miner-userguides.h"
#include "tracker-miner-applications.h"
#include "tracker-miner-files.h"
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index 26ae704..7b6a67d 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -24,7 +24,6 @@
#include <libtracker-miner/tracker-miner-dbus.h>
#include "tracker-miner-files-index.h"
-#include "tracker-marshal.h"
static const gchar introspection_xml[] =
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 17081f2..5502f2d 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -48,7 +48,6 @@
#include "tracker-power.h"
#include "tracker-miner-files.h"
#include "tracker-config.h"
-#include "tracker-marshal.h"
#define DISK_SPACE_CHECK_FREQUENCY 10
#define SECONDS_PER_DAY 86400
diff --git a/src/miners/fs/tracker-power-hal.c b/src/miners/fs/tracker-power-hal.c
index a989cb5..c5e15ba 100644
--- a/src/miners/fs/tracker-power-hal.c
+++ b/src/miners/fs/tracker-power-hal.c
@@ -28,7 +28,6 @@
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-marshal.h>
#include "tracker-power.h"
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index ff84230..4d37fc2 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -520,7 +520,6 @@ libextract_libav_la_LIBADD = \
libexec_PROGRAMS = tracker-extract
tracker_extract_SOURCES = \
- $(marshal_sources) \
tracker-config.c \
tracker-config.h \
tracker-controller.c \
@@ -564,21 +563,5 @@ tracker_extract_SOURCES += tracker-media-art-dummy.c
endif
endif
-marshal_sources = \
- tracker-marshal.h \
- tracker-marshal.c
-
-tracker-marshal.h: tracker-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
-
-tracker-marshal.c: tracker-marshal.list
- $(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
-
-BUILT_SOURCES = $(marshal_sources)
-
-CLEANFILES = $(BUILT_SOURCES)
-
EXTRA_DIST = \
- tracker-marshal.list \
$(rules_files)
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 58de1b1..3f6c8c4 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -35,7 +35,6 @@
#include "tracker-extract.h"
#include "tracker-main.h"
-#include "tracker-marshal.h"
#ifdef HAVE_LIBSTREAMANALYZER
#include "tracker-topanalyzer.h"
diff --git a/src/tracker-extract/tracker-media-art.c b/src/tracker-extract/tracker-media-art.c
index 6a4b7b3..b438b63 100644
--- a/src/tracker-extract/tracker-media-art.c
+++ b/src/tracker-extract/tracker-media-art.c
@@ -42,7 +42,6 @@
#include "tracker-media-art.h"
#include "tracker-extract.h"
-#include "tracker-marshal.h"
#include "tracker-media-art-generic.h"
#define ALBUMARTER_SERVICE "com.nokia.albumart"
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 4e30c64..35d1e86 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -47,7 +47,6 @@ endif
libexec_PROGRAMS = tracker-writeback
tracker_writeback_SOURCES = \
- $(marshal_sources) \
$(dbus_sources) \
tracker-config.c \
tracker-config.h \
@@ -65,22 +64,3 @@ tracker_writeback_LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(BUILD_LIBS) \
$(TRACKER_WRITEBACK_LIBS)
-
-marshal_sources = \
- tracker-marshal.h \
- tracker-marshal.c
-
-tracker-marshal.h: tracker-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
-
-tracker-marshal.c: tracker-marshal.list
- $(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
-
-BUILT_SOURCES = \
- $(marshal_sources)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = tracker-marshal.list
-
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index a86b131..e2c447f 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -2,8 +2,6 @@ include $(top_srcdir)/Makefile.decl
# Include list of shared sources:
# Defines:
-# $(libtracker_miner_marshal_sources)
-# $(libtracker_miner_marshal_headers)
# $(libtracker_miner_monitor_sources)
# $(libtracker_miner_monitor_headers)
#
@@ -95,7 +93,6 @@ tracker_monitor_test_SOURCES = \
if !ENABLE_GCOV
# If gcov is enabled, libtracker-miner exports all symbols and this is not needed.
tracker_monitor_test_SOURCES += \
- $(libtracker_miner_marshal_sources) \
$(libtracker_miner_monitor_sources)
endif
@@ -115,7 +112,6 @@ tracker_file_notifier_test_SOURCES = \
tracker-file-notifier-test.c
noinst_HEADERS = \
- $(libtracker_miner_marshal_headers) \
$(libtracker_miner_monitor_headers) \
tracker-miner-mock.h \
thumbnailer-mock.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
