tracker r3181 - in trunk: . src/tracker-applet

[carlosg svn gnome org]

Author: carlosg
Date: Mon Apr  6 15:59:41 2009
New Revision: 3181
URL: http://svn.gnome.org/viewvc/tracker?rev=3181&view=rev

Log:
2009-04-06  Carlos Garnacho  <carlos imendio com>

        * src/tracker-applet/tracker-applet-marshallers.[ch]: Do not keep
        generated code.
        * src/tracker-applet/tracker-marshal.list:
        * src/tracker-applet/tracker-marshal-main.c:
        * src/tracker-applet/Makefile.am: Instead use the right tools.
        * src/tracker-applet/tracker-applet.c: Adapt to name changes.

Added:
   trunk/src/tracker-applet/tracker-marshal-main.c
   trunk/src/tracker-applet/tracker-marshal.list
Removed:
   trunk/src/tracker-applet/tracker-applet-marshallers.c
   trunk/src/tracker-applet/tracker-applet-marshallers.h
Modified:
   trunk/ChangeLog
   trunk/src/tracker-applet/Makefile.am
   trunk/src/tracker-applet/tracker-applet.c

Modified: trunk/src/tracker-applet/Makefile.am
==============================================================================
--- trunk/src/tracker-applet/Makefile.am	(original)
+++ trunk/src/tracker-applet/Makefile.am	Mon Apr  6 15:59:41 2009
@@ -20,11 +20,23 @@
 	$(LIBGLADE_LIBS)						\
 	$(GCOV_LIBS)
 
+tracker-marshal.h: tracker-marshal.list
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
+
+tracker-marshal.c: tracker-marshal.list
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body > $@
+
+marshal_sources =                                         		\
+        tracker-marshal.h                             			\
+        tracker-marshal.c
+
+BUILT_SOURCES = 							\
+	$(marshal_sources)
+
 tracker_applet_SOURCES = 						\
 	tracker-applet.c 						\
-	tracker-applet.h 						\
-	tracker-applet-marshallers.c 					\
-	tracker-applet-marshallers.h
+	tracker-applet.h						\
+	tracker-marshal-main.c
 
 icondir = $(datadir)/tracker/icons
 
@@ -42,6 +54,6 @@
 pkgdata_DATA = tracker-applet-prefs.glade
 
 
-EXTRA_DIST = $(icon_DATA) $(pkgdata_DATA)
+EXTRA_DIST = $(icon_DATA) $(pkgdata_DATA) tracker-marshal.list
 
-CLEANFILES = $(autostart_DATA)
+CLEANFILES = $(autostart_DATA) $(BUILT_SOURCES)

Modified: trunk/src/tracker-applet/tracker-applet.c
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.c	(original)
+++ trunk/src/tracker-applet/tracker-applet.c	Mon Apr  6 15:59:41 2009
@@ -53,7 +53,7 @@
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-applet.h"
-#include "tracker-applet-marshallers.h"
+#include "tracker-marshal.h"
 
 #define TRAY_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_TRAY_ICON, TrayIconPrivate))
 
@@ -1845,7 +1845,7 @@
 	}
 
 	/* Set signal handlers */
-	dbus_g_object_register_marshaller (tracker_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
+	dbus_g_object_register_marshaller (tracker_marshal_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
 					   G_TYPE_NONE,
 					   G_TYPE_STRING,
 					   G_TYPE_BOOLEAN,
@@ -1856,7 +1856,7 @@
 					   G_TYPE_BOOLEAN,
 					   G_TYPE_INVALID);
 
-	dbus_g_object_register_marshaller (tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
+	dbus_g_object_register_marshaller (tracker_marshal_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
 					   G_TYPE_NONE,
 					   G_TYPE_STRING,
 					   G_TYPE_STRING,

Added: trunk/src/tracker-applet/tracker-marshal-main.c
==============================================================================
--- (empty file)
+++ trunk/src/tracker-applet/tracker-marshal-main.c	Mon Apr  6 15:59:41 2009
@@ -0,0 +1,2 @@
+#include "tracker-marshal.h"
+#include "tracker-marshal.c"

Added: trunk/src/tracker-applet/tracker-marshal.list
==============================================================================
--- (empty file)
+++ trunk/src/tracker-applet/tracker-marshal.list	Mon Apr  6 15:59:41 2009
@@ -0,0 +1,3 @@
+VOID:STRING,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN
+VOID:STRING,STRING,INT,INT,INT,DOUBLE
+VOID:STRING,BOOLEAN