tracker r2146 - in branches/indexer-split: . src/tracker-extract

[carlosg svn gnome org]

Author: carlosg
Date: Mon Aug 25 08:56:59 2008
New Revision: 2146
URL: http://svn.gnome.org/viewvc/tracker?rev=2146&view=rev

Log:
2008-08-25  Carlos Garnacho  <carlos imendio com>

        * src/tracker-extract/Makefile.am:
        * src/tracker-extract/tracker-extract-ps.c: Fix up symbol not found
        that prevented the PS module to be loaded.
        * src/tracker-extract/tracker-extract.c (initialize_extractors):
        Provide a better error message if a module can't be loaded.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-extract/Makefile.am
   branches/indexer-split/src/tracker-extract/tracker-extract-ps.c
   branches/indexer-split/src/tracker-extract/tracker-extract.c

Modified: branches/indexer-split/src/tracker-extract/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-extract/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-extract/Makefile.am	Mon Aug 25 08:56:59 2008
@@ -14,6 +14,7 @@
 	$(POPPLER_GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(XINE_CFLAGS) \
+	-I$(top_srcdir)/src \
 	-DMODULES_DIR=\"$(modulesdir)\"
 
 modules_LTLIBRARIES = \
@@ -88,7 +89,9 @@
 
 libextract_ps_la_SOURCES = tracker-extract-ps.c
 libextract_ps_la_LDFLAGS = $(module_flags)
-libextract_ps_la_LIBADD = $(GLIB2_LIBS)
+libextract_ps_la_LIBADD = \
+	$(GLIB2_LIBS) \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la
 
 libextract_totem_la_SOURCES = tracker-extract-totem.c
 libextract_totem_la_LDFLAGS = $(module_flags)

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-ps.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-ps.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-ps.c	Mon Aug 25 08:56:59 2008
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include <libtracker-common/tracker-os-dependant.h>
 #include "tracker-extract.h"
 
 #if !HAVE_GETLINE
@@ -249,11 +250,6 @@
         }
 }
 
-
-/* our private prototype */
-void tracker_child_cb (gpointer user_data);
-
-
 static void
 tracker_extract_ps_gz (const gchar *filename, GHashTable *metadata)
 {

Modified: branches/indexer-split/src/tracker-extract/tracker-extract.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract.c	Mon Aug 25 08:56:59 2008
@@ -215,7 +215,7 @@
 		module = g_module_open (module_path, G_MODULE_BIND_LOCAL);
 
 		if (!module) {
-			g_warning ("Could not load module: %s", name);
+			g_warning ("Could not load module '%s': %s", name, g_module_error ());
 			g_free (module_path);
 			continue;
 		}