[nautilus-actions] Refactoring: update src/plugin-tracker/

[Pierre Wieser <pwieser src gnome org>]

commit dc371bf0642b29d62d30f36e0ae16a8b3671ba3a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Feb 15 20:02:53 2010 +0100

    Refactoring: update src/plugin-tracker/

 ChangeLog                            |    1 +
 src/plugin-tracker/Makefile.am       |   12 +++++++-----
 src/plugin-tracker/na-tracker-dbus.c |    6 +++---
 src/plugin-tracker/na-tracker-dbus.h |    2 +-
 src/plugin-tracker/na-tracker.c      |   12 ++++++------
 src/plugin-tracker/na-tracker.h      |    2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6b5aeb2..bae898c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-02-15 Pierre Wieser <pwieser trychlos org>
 
+	Update src/plugin-tracker.
 	Update src/plugin-menu.
 
 	Define NAIImporter interface.
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index 7f28006..229075e 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -28,7 +28,6 @@
 
 AM_CPPFLAGS += \
 	-I $(top_srcdir)											\
-	-I $(top_srcdir)/nautilus-actions							\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_TRACKER}\"					\
 	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
@@ -52,14 +51,17 @@ libnautilus_actions_tracker_la_SOURCES = \
 	na-tracker-plugin.c											\
 	$(NULL)
 
-libnautilus_actions_tracker_la_LDFLAGS = -module -avoid-version
-
 libnautilus_actions_tracker_la_LIBADD = \
-	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
-	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
+	$(top_builddir)/src/core/libna-core.la						\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
+libnautilus_actions_tracker_la_LDFLAGS = \
+	-module 													\
+	-no-undefined												\
+	-avoid-version 												\
+	$(NULL)
+
 EXTRA_DIST = \
 	na-tracker-dbus.xml											\
 	$(NULL)
diff --git a/src/plugin-tracker/na-tracker-dbus.c b/src/plugin-tracker/na-tracker-dbus.c
index ed25ea4..04b65dd 100644
--- a/src/plugin-tracker/na-tracker-dbus.c
+++ b/src/plugin-tracker/na-tracker-dbus.c
@@ -41,7 +41,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <api/na-dbus.h>
+#include <core/na-dbus.h>
 
 #include "na-tracker-dbus.h"
 #include "na-tracker-dbus-glue.h"
@@ -160,12 +160,12 @@ instance_dispose( GObject *object )
 
 	if( !self->private->dispose_has_run ){
 
+		self->private->dispose_has_run = TRUE;
+
 		/* chain up to the parent class */
 		if( G_OBJECT_CLASS( st_parent_class )->dispose ){
 			G_OBJECT_CLASS( st_parent_class )->dispose( object );
 		}
-
-		self->private->dispose_has_run = TRUE;
 	}
 }
 
diff --git a/src/plugin-tracker/na-tracker-dbus.h b/src/plugin-tracker/na-tracker-dbus.h
index f00a32d..91e4837 100644
--- a/src/plugin-tracker/na-tracker-dbus.h
+++ b/src/plugin-tracker/na-tracker-dbus.h
@@ -56,7 +56,7 @@ G_BEGIN_DECLS
 #define NA_IS_TRACKER_DBUS_CLASS( klass )	( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TRACKER_DBUS_TYPE ))
 #define NA_TRACKER_DBUS_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TRACKER_DBUS_TYPE, NATrackerDBusClass ))
 
-typedef struct NATrackerDBusPrivate NATrackerDBusPrivate;
+typedef struct NATrackerDBusPrivate      NATrackerDBusPrivate;
 
 typedef struct
 {
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/na-tracker.c
index 1557203..e4afcb4 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/na-tracker.c
@@ -32,14 +32,14 @@
 #include <config.h>
 #endif
 
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 
-#include <api/na-dbus.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <api/na-dbus-names.h>
 
 #include "na-tracker.h"
 #include "na-tracker-dbus.h"
@@ -231,6 +231,8 @@ instance_dispose( GObject *object )
 
 	if( !self->private->dispose_has_run ){
 
+		self->private->dispose_has_run = TRUE;
+
 		g_object_unref( self->private->tracker );
 		self->private->tracker = NULL;
 
@@ -238,8 +240,6 @@ instance_dispose( GObject *object )
 		if( G_OBJECT_CLASS( st_parent_class )->dispose ){
 			G_OBJECT_CLASS( st_parent_class )->dispose( object );
 		}
-
-		self->private->dispose_has_run = TRUE;
 	}
 }
 
diff --git a/src/plugin-tracker/na-tracker.h b/src/plugin-tracker/na-tracker.h
index b1399fe..2260e06 100644
--- a/src/plugin-tracker/na-tracker.h
+++ b/src/plugin-tracker/na-tracker.h
@@ -55,7 +55,7 @@ G_BEGIN_DECLS
 #define NA_IS_TRACKER_CLASS( klass )	( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TRACKER_TYPE ))
 #define NA_TRACKER_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TRACKER_TYPE, NATrackerClass ))
 
-typedef struct NATrackerPrivate NATrackerPrivate;
+typedef struct NATrackerPrivate      NATrackerPrivate;
 
 typedef struct
 {