tracker r1480 - in branches/xesam-support: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon May 26 08:34:29 2008
New Revision: 1480
URL: http://svn.gnome.org/viewvc/tracker?rev=1480&view=rev

Log:
2008-05-26  Philip Van Hoof  <pvanhoof gnome org>

        * Merged xesam-support with indexer-split
         svn merge -r 1475:1479 ../indexer-split



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/trackerd/tracker-main.c
   branches/xesam-support/src/trackerd/tracker-main.h

Modified: branches/xesam-support/src/trackerd/tracker-main.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-main.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-main.c	Mon May 26 08:34:29 2008
@@ -1050,9 +1050,11 @@
 	tracker_nfs_lock_shutdown ();
 	tracker_log_shutdown ();
 
+#ifdef HAVE_HAL
         if (tracker->hal) {
                 g_object_unref (tracker->hal);
         }
+#endif
 
 	if (tracker->language) {
 		g_object_unref (tracker->language);

Modified: branches/xesam-support/src/trackerd/tracker-main.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-main.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-main.h	Mon May 26 08:34:29 2008
@@ -52,7 +52,11 @@
 
 	gboolean         reindex;
 
+
+#ifdef HAVE_HAL
 	TrackerHal      *hal;
+#endif
+
         TrackerConfig   *config;
         TrackerLanguage *language;