tracker r2713 - in trunk: . src/tracker-indexer src/tracker-indexer/modules

[carlosg svn gnome org]

Author: carlosg
Date: Tue Dec 16 16:38:22 2008
New Revision: 2713
URL: http://svn.gnome.org/viewvc/tracker?rev=2713&view=rev

Log:
2008-12-16  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/Makefile.am:
        * src/tracker-indexer/modules/Makefile.am: Enable -Wall

        * src/tracker-indexer/modules/evolution-common.c:
        * src/tracker-indexer/modules/evolution-imap.[ch]:
        * src/tracker-indexer/modules/evolution-pop.[ch]:
        * src/tracker-indexer/tracker-indexer.c:
        * src/tracker-indexer/tracker-module-metadata.c: Fix compiler
        warnings.

Modified:
   trunk/ChangeLog
   trunk/src/tracker-indexer/Makefile.am
   trunk/src/tracker-indexer/modules/Makefile.am
   trunk/src/tracker-indexer/modules/evolution-common.c
   trunk/src/tracker-indexer/modules/evolution-imap.c
   trunk/src/tracker-indexer/modules/evolution-imap.h
   trunk/src/tracker-indexer/modules/evolution-pop.c
   trunk/src/tracker-indexer/tracker-indexer.c
   trunk/src/tracker-indexer/tracker-module-metadata.c

Modified: trunk/src/tracker-indexer/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/Makefile.am	(original)
+++ trunk/src/tracker-indexer/Makefile.am	Tue Dec 16 16:38:22 2008
@@ -3,6 +3,7 @@
 SUBDIRS = modules
 
 INCLUDES =								\
+	-Wall								\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\

Modified: trunk/src/tracker-indexer/modules/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/modules/Makefile.am	(original)
+++ trunk/src/tracker-indexer/modules/Makefile.am	Tue Dec 16 16:38:22 2008
@@ -4,6 +4,7 @@
 indexer_modulesdir = $(libdir)/tracker/indexer-modules
 
 INCLUDES =								\
+	-Wall								\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\

Modified: trunk/src/tracker-indexer/modules/evolution-common.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-common.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution-common.c	Tue Dec 16 16:38:22 2008
@@ -25,7 +25,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <glib.h>
 #include <gio/gio.h>
+#include <glib/gstdio.h>
 
 #include <tracker-indexer/tracker-module-metadata-utils.h>
 

Modified: trunk/src/tracker-indexer/modules/evolution-imap.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-imap.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution-imap.c	Tue Dec 16 16:38:22 2008
@@ -876,7 +876,6 @@
         TrackerEvolutionImapFile *self;
 	TrackerModuleMetadata *metadata = NULL;
 	gchar *subject, *from, *to, *cc;
-	gchar *date;
 	gint32 i, count, flags;
 	time_t t;
 	GList *list, *l;

Modified: trunk/src/tracker-indexer/modules/evolution-imap.h
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-imap.h	(original)
+++ trunk/src/tracker-indexer/modules/evolution-imap.h	Tue Dec 16 16:38:22 2008
@@ -62,7 +62,7 @@
         TrackerModuleFileClass parent_class;
 };
 
-void                tracker_evolution_pop_file_register (GTypeModule *module);
+void                tracker_evolution_imap_file_register (GTypeModule *module);
 
 TrackerModuleFile * tracker_evolution_imap_file_new     (GFile *file);
 

Modified: trunk/src/tracker-indexer/modules/evolution-pop.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-pop.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution-pop.c	Tue Dec 16 16:38:22 2008
@@ -23,6 +23,8 @@
 
 #include <string.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include <libtracker-data/tracker-data-metadata.h>
 
@@ -51,7 +53,6 @@
 
 static void          tracker_evolution_pop_file_iteratable_init  (TrackerModuleIteratableIface *iface);
 static gboolean      tracker_evolution_pop_file_iter_contents    (TrackerModuleIteratable *iteratable);
-static guint         tracker_evolution_pop_file_get_count        (TrackerModuleIteratable *iteratable);
 
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (TrackerEvolutionPopFile, tracker_evolution_pop_file, TRACKER_TYPE_MODULE_FILE, 0,
@@ -192,7 +193,7 @@
                  GMimeMessage      *message)
 {
         TrackerEvolutionPopFile *self;
-	gchar *path, *uri, *name;
+	gchar *path, *uri;
         gint message_id;
 
         self = TRACKER_EVOLUTION_POP_FILE (file);
@@ -360,6 +361,8 @@
 	}
 
 	g_list_free (list);
+
+	return metadata;
 }
 
 static TrackerModuleMetadata *

Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c	(original)
+++ trunk/src/tracker-indexer/tracker-indexer.c	Tue Dec 16 16:38:22 2008
@@ -877,7 +877,6 @@
 {
 	TrackerIndexerPrivate *priv;
 	TrackerDBIndex *index;
-	GList *l;
 
 	priv = indexer->private = TRACKER_INDEXER_GET_PRIVATE (indexer);
 
@@ -1343,7 +1342,6 @@
 get_service_for_file (TrackerModuleFile    *file,
 		      TrackerIndexerModule *module)
 {
-	TrackerService *service;
 	const gchar *service_type;
 
 	service_type = tracker_module_file_get_service_type (file);
@@ -1527,11 +1525,9 @@
 	TrackerService *service;
 	TrackerDataMetadata *old_metadata;
 	TrackerModuleMetadata *new_metadata;
-	gchar *service_type;
 	gchar *new_path, *new_name, *ext;
-	GFile *file, *other_file;
 	gchar *path, *other_path;
-	gchar *uri, *other_uri, *mime_type;
+	gchar *other_uri;
 	guint32 service_id;
 	gchar *mount_point = NULL;
 
@@ -1564,7 +1560,6 @@
 	old_metadata = tracker_data_query_metadata (service, service_id, TRUE);
 
 	if (old_metadata) {
-		GFile *file;
 		const gchar *mime_type;
 		gchar *uri;
 
@@ -1574,7 +1569,7 @@
 
 		mime_type = tracker_data_metadata_lookup (old_metadata, "File:Mime");
 		tracker_thumbnailer_move (uri, mime_type, other_uri);
-		
+
 		g_free (other_uri);
 		g_free (uri);
 	} else {

Modified: trunk/src/tracker-indexer/tracker-module-metadata.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-metadata.c	(original)
+++ trunk/src/tracker-indexer/tracker-module-metadata.c	Tue Dec 16 16:38:22 2008
@@ -55,7 +55,7 @@
 						 NULL);
 }
 
-static gboolean
+static void
 free_metadata (TrackerField *field,
 	       gpointer      data)
 {