tracker r3158 - in trunk: . src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Tue Mar 31 16:06:40 2009
New Revision: 3158
URL: http://svn.gnome.org/viewvc/tracker?rev=3158&view=rev

Log:
2009-03-31  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-module-metadata-utils.c
        (metadata_utils_get_embedded): Check for NULL context, since it can
        potentially happen, noticed by Philip Van Hoof. Prevents Bug
        NB#108819.
        (extractor_context_create): Raise severity of error message.

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

Modified: trunk/src/tracker-indexer/tracker-module-metadata-utils.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-metadata-utils.c	(original)
+++ trunk/src/tracker-indexer/tracker-module-metadata-utils.c	Tue Mar 31 16:06:40 2009
@@ -228,8 +228,8 @@
         if (!org_freedesktop_Tracker_Extract_get_pid (get_dbus_extract_proxy (),
                                                       &pid,
                                                       &error)) {
-                g_message ("Couldn't get PID from tracker-extract, %s",
-                           error ? error->message : "no error given");
+                g_critical ("Couldn't get PID from tracker-extract, %s",
+			    error ? error->message : "no error given");
                 g_clear_error (&error);
                 return NULL;
         }
@@ -406,7 +406,12 @@
         }
 
         context = extractor_context_create (metadata);
-        g_object_set_data (G_OBJECT (file), "extractor-context", context);
+
+	if (!context) {
+		return;
+	}
+
+	g_object_set_data (G_OBJECT (file), "extractor-context", context);
         path = g_file_get_path (file);
 
         org_freedesktop_Tracker_Extract_get_metadata_async (get_dbus_extract_proxy (),