[tracker/writeback] Cleanups that where harder to rebase properly

[Philip Van Hoof <pvanhoof src gnome org>]

commit a936176d6cee67f863b8a649aa152bde04d4545a
Author: Philip Van Hoof <philip codeminded be>
Date:   Sun Nov 22 14:00:23 2009 +0100

    Cleanups that where harder to rebase properly

 src/libtracker-common/tracker-dbus.h               |    2 +-
 src/tracker-store/tracker-resources.c              |    2 +-
 src/tracker-writeback/Makefile.am                  |   40 ++++++++++----------
 .../tracker-writeback-dispatcher.c                 |    4 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index 6645f43..65f69d2 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
 
-#define TRACKER_TYPE_STR_PTR_ARRAY_MAP (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRV))
+#define TRACKER_TYPE_STR_STRV_MAP (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRV))
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index afc89d1..b9d37f5 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -110,7 +110,7 @@ tracker_resources_class_init (TrackerResourcesClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__BOXED,
 			      G_TYPE_NONE, 1,
-			      TRACKER_TYPE_STR_PTR_ARRAY_MAP);
+			      TRACKER_TYPE_STR_STRV_MAP);
 
 	g_type_class_add_private (object_class, sizeof (TrackerResourcesPrivate));
 }
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index c35e9dd..1354efa 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -3,20 +3,20 @@ include $(top_srcdir)/Makefile.decl
 module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules
 
-INCLUDES = 									\
-	-DLOCALEDIR=\""$(localedir)"\" 			\
-	-DMODULESDIR=\"$(modulesdir)\"			\
+INCLUDES = 							\
+	-DLOCALEDIR=\""$(localedir)"\" 				\
+	-DMODULESDIR=\"$(modulesdir)\"				\
 	-DG_LOG_DOMAIN=\"Tracker\"				\
 	-DTRACKER_COMPILATION					\
-	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" \
+	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" 		\
 	-I$(top_srcdir)/src 					\
 	$(TRACKER_APPS_CFLAGS)					\
-	$(WARN_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
-	$(GMODULE_CFLAGS) 						\
-	$(DBUS_CFLAGS)							\
-	$(ID3LIB_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(GLIB2_CFLAGS)						\
+	$(GCOV_CFLAGS)						\
+	$(GMODULE_CFLAGS) 					\
+	$(DBUS_CFLAGS)						\
+	$(ID3LIB_CFLAGS)					\
 	$(EXEMPI_CFLAGS)
 
 modules_LTLIBRARIES =
@@ -43,23 +43,23 @@ endif
 libexec_PROGRAMS = tracker-writeback
 
 tracker_writeback_SOURCES = 				\
-	$(marshal_sources)						\
-	$(dbus_sources)							\
+	$(marshal_sources)				\
+	$(dbus_sources)					\
 	tracker-writeback-dispatcher.c			\
 	tracker-writeback-dispatcher.h			\
-	tracker-writeback-file.c				\
-	tracker-writeback-file.h				\
-	tracker-writeback-module.c				\
-	tracker-writeback-module.h				\
-	tracker-writeback.c						\
-	tracker-writeback.h						\
+	tracker-writeback-file.c			\
+	tracker-writeback-file.h			\
+	tracker-writeback-module.c			\
+	tracker-writeback-module.h			\
+	tracker-writeback.c				\
+	tracker-writeback.h				\
 	tracker-main.c
 
-tracker_writeback_LDADD = 					\
+tracker_writeback_LDADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner.la 	\
-	$(TRACKER_APPS_LIBS)					\
+	$(TRACKER_APPS_LIBS)						\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
diff --git a/src/tracker-writeback/tracker-writeback-dispatcher.c b/src/tracker-writeback/tracker-writeback-dispatcher.c
index 63df7e7..c91c485 100644
--- a/src/tracker-writeback/tracker-writeback-dispatcher.c
+++ b/src/tracker-writeback/tracker-writeback-dispatcher.c
@@ -157,7 +157,7 @@ dbus_data_create (GObject *object)
 
 	dbus_g_object_register_marshaller (tracker_marshal_VOID__BOXED,
 	                                   G_TYPE_NONE,
-	                                   TRACKER_TYPE_STR_PTR_ARRAY_MAP,
+	                                   TRACKER_TYPE_STR_STRV_MAP,
 	                                   G_TYPE_INVALID);
 
 	/* Now we're successfully connected and registered, create the data */
@@ -202,7 +202,7 @@ tracker_writeback_dispatcher_init (TrackerWritebackDispatcher *dispatcher)
 	                                                     TRACKER_INTERFACE_RESOURCES);
 
 	dbus_g_proxy_add_signal (priv->dbus_data->tproxy, "Writeback",
-	                         TRACKER_TYPE_STR_PTR_ARRAY_MAP,
+	                         TRACKER_TYPE_STR_STRV_MAP,
 	                         G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (priv->dbus_data->tproxy, "Writeback",