tracker r2521 - in trunk: . src/tracker-indexer src/trackerd

[mr svn gnome org]

Author: mr
Date: Tue Nov 18 17:20:28 2008
New Revision: 2521
URL: http://svn.gnome.org/viewvc/tracker?rev=2521&view=rev

Log:
	* src/tracker-indexer/tracker-metadata-utils.c: Fix the way we
	check if we should do thumbnailing. Don't explicitly #define
	HAVE_HILDON_THUMBNAIL now, use the config.h value instead. This
	was causing a lot of indexer log warnings about not being able to
	contact the thumbnailer daemon.

	* src/trackerd/tracker-main.c: Small code cleanups.


Modified:
   trunk/ChangeLog
   trunk/src/tracker-indexer/tracker-indexer.c
   trunk/src/tracker-indexer/tracker-metadata-utils.c
   trunk/src/trackerd/tracker-main.c

Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c	(original)
+++ trunk/src/tracker-indexer/tracker-indexer.c	Tue Nov 18 17:20:28 2008
@@ -2605,7 +2605,6 @@
 	tracker_dbus_request_new (request_id,
 				  "DBus request to disable all volumes");
 
-
 	tracker_data_update_disable_all_volumes ();
 
 	dbus_g_method_return (context);

Modified: trunk/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-metadata-utils.c	(original)
+++ trunk/src/tracker-indexer/tracker-metadata-utils.c	Tue Nov 18 17:20:28 2008
@@ -33,9 +33,6 @@
 #include "tracker-metadata-utils.h"
 #include "tracker-dbus.h"
 
-#define THUMBNAIL_RETRIEVAL_ENABLED
-#define HAVE_HILDON_THUMBNAIL
-
 #define METADATA_FILE_NAME_DELIMITED "File:NameDelimited"
 #define METADATA_FILE_EXT	     "File:Ext"
 #define METADATA_FILE_PATH	     "File:Path"
@@ -651,7 +648,6 @@
 	return s ? g_string_free (s, FALSE) : NULL;
 }
 
-#ifdef THUMBNAIL_RETRIEVAL_ENABLED
 #ifdef HAVE_HILDON_THUMBNAIL
 
 static void
@@ -673,8 +669,6 @@
 	}
 }
 
-#endif /* HAVE_HILDON_THUMBNAIL */
-
 static gboolean
 thumbnail_this (GStrv list, const gchar *mime)
 {
@@ -691,6 +685,7 @@
 	}
 
 	return retval;
+
 }
 
 static gboolean
@@ -725,6 +720,8 @@
 	return FALSE;
 }
 
+#endif /* HAVE_HILDON_THUMBNAIL */
+
 static void
 get_file_thumbnail (const gchar *path,
 		    const gchar *mime)
@@ -775,8 +772,9 @@
 	if (count == 51) {
 		request_thumbnails (NULL);
 	}
+#endif /* HAVE_HILDON_THUMBNAIL */
 
-#else /* HAVE_HILDON_THUMBNAIL */
+#ifdef HAVE_IMAGEMAGICK
 	ProcessContext *context;
 
 	GString *thumbnail;
@@ -813,11 +811,9 @@
 	g_debug ("Got thumbnail '%s' for '%s'", thumbnail->str, path);
 
 	g_string_free (thumbnail, TRUE);
-#endif /* HAVE_HILDON_THUMBNAIL */
+#endif /* HAVE_IMAGEMAGICK */
 }
 
-#endif /* THUMBNIAL_RETRIEVAL_ENABLED */
-
 static gchar *
 get_file_content_by_filter (const gchar *path,
 			    const gchar *mime)

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Tue Nov 18 17:20:28 2008
@@ -84,7 +84,7 @@
 
 typedef enum {
 	TRACKER_RUNNING_NON_ALLOWED,
-	TRACKER_RUNNING_READ_ONLY,
+	TRACKER_RUNNING_READONLY,
 	TRACKER_RUNNING_MAIN_INSTANCE
 } TrackerRunningLevel;
 
@@ -219,8 +219,8 @@
 	g_message ("Checking instances running...");
 
 	if (!tracker_config_get_enable_indexing (config)) {
-		g_message ("Indexing disabled, running in read-only mode");
-		return TRACKER_RUNNING_READ_ONLY;
+		g_message ("Indexing disabled in config, running in read-only mode");
+		return TRACKER_RUNNING_READONLY;
 	}
 
 	use_nfs = tracker_config_get_nfs_locking (config);
@@ -246,7 +246,7 @@
 		if (use_nfs) {
 			g_message ("Already running, running in "
 				   "read-only mode (with NFS)");
-			runlevel = TRACKER_RUNNING_READ_ONLY;
+			runlevel = TRACKER_RUNNING_READONLY;
 		} else {
 			g_message ("Already running, not allowed "
 				   "multiple instances (without NFS)");
@@ -268,7 +268,7 @@
 			g_message ("Battery in use");
 			g_message ("Config is set to not index on battery");
 			g_message ("Running in read only mode");
-			runlevel = TRACKER_RUNNING_READ_ONLY;
+			runlevel = TRACKER_RUNNING_READONLY;
 		}
 
 		/* Special case first time situation which are
@@ -280,7 +280,7 @@
 			g_message ("Battery in use & reindex is needed");
 			g_message ("Config is set to not index on battery for initial index");
 			g_message ("Running in read only mode");
-			runlevel = TRACKER_RUNNING_READ_ONLY;
+			runlevel = TRACKER_RUNNING_READONLY;
 		}
 #endif /* HAVE_HAL */
 	}
@@ -958,7 +958,7 @@
 	case TRACKER_RUNNING_NON_ALLOWED:
 		return EXIT_FAILURE;
 
-	case TRACKER_RUNNING_READ_ONLY:
+	case TRACKER_RUNNING_READONLY:
 		tracker_status_set_is_readonly (TRUE);
 		break;