tracker r2205 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer/modules src/trackerd

[mr svn gnome org]

Author: mr
Date: Tue Sep  9 09:53:35 2008
New Revision: 2205
URL: http://svn.gnome.org/viewvc/tracker?rev=2205&view=rev

Log:
	* src/libtracker-common/tracker-file-utils.c:
	(tracker_file_get_mime_type): Improve the error message.

	* src/tracker-indexer/modules/files.c: Small clean up.
	* src/trackerd/tracker-monitor.c: Fixed the signal emission so the
	file and other file are the right way round for one of the MOVE
	events. This is probably why renaming a file was not working before.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-file-utils.c
   branches/indexer-split/src/tracker-indexer/modules/files.c
   branches/indexer-split/src/trackerd/tracker-monitor.c

Modified: branches/indexer-split/src/libtracker-common/tracker-file-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-file-utils.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-file-utils.c	Tue Sep  9 09:53:35 2008
@@ -251,9 +251,9 @@
 tracker_file_get_mime_type (const gchar *path)
 {
 	GFileInfo *info;
-	GFile *file;
-	GError *error = NULL;
-	gchar *content_type;
+	GFile     *file;
+	GError    *error = NULL;
+	gchar     *content_type;
 
 	file = g_file_new_for_path (path);
 	info = g_file_query_info (file,
@@ -262,7 +262,8 @@
 				  NULL, &error);
 
 	if (error) {
-		g_warning ("Error guessing mimetype for '%s': %s\n", path, error->message);
+		g_warning ("Could not guess mimetype, %s\n", 
+			   error->message);
 		g_error_free (error);
 
 		return g_strdup ("unknown");
@@ -280,7 +281,6 @@
 	return content_type;
 }
 
-
 static gchar *
 tracker_file_get_vfs_path (const gchar *uri)
 {

Modified: branches/indexer-split/src/tracker-indexer/modules/files.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/files.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/files.c	Tue Sep  9 09:53:35 2008
@@ -52,12 +52,12 @@
 gchar *
 tracker_module_file_get_service_type (TrackerFile *file)
 {
-        gchar *mimetype;
+        gchar *mime_type;
         gchar *service_type;
 
-        mimetype = tracker_file_get_mime_type (file->path);
-        service_type = tracker_ontology_get_service_type_for_mime (mimetype);
-        g_free (mimetype);
+        mime_type = tracker_file_get_mime_type (file->path);
+        service_type = tracker_ontology_get_service_type_for_mime (mime_type);
+        g_free (mime_type);
 
         return service_type;
 }

Modified: branches/indexer-split/src/trackerd/tracker-monitor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-monitor.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-monitor.c	Tue Sep  9 09:53:35 2008
@@ -1115,9 +1115,6 @@
 		case IN_MOVED_FROM:
 		case IN_DELETE:
 		case IN_DELETE_SELF:
-			/* FIXME: What if we don't monitor the other
-			 * location?
-			 */
 			if (cookie == 0) {
 				g_signal_emit (monitor, 
 					       signals[ITEM_DELETED], 0, 
@@ -1156,8 +1153,8 @@
 				g_signal_emit (monitor, 
 					       signals[ITEM_MOVED], 0,
 					       module_name, 
-					       file, 
-					       other_file,
+					       other_file, 
+					       file,
 					       is_directory);
 				g_hash_table_remove (monitor->private->event_pairs,
 						     GUINT_TO_POINTER (cookie));