tracker r2721 - in trunk: . src/libtracker-common src/libtracker-data src/tracker-indexer src/tracker-indexer/modules

[carlosg svn gnome org]

Author: carlosg
Date: Wed Dec 17 10:58:53 2008
New Revision: 2721
URL: http://svn.gnome.org/viewvc/tracker?rev=2721&view=rev

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

        * src/libtracker-common/tracker-log.c:
        * src/libtracker-data/tracker-rdf-query.c:
        * src/tracker-indexer/modules/applications.c:
        * src/tracker-indexer/modules/evolution-imap.h:
        * src/tracker-indexer/modules/evolution-pop.h:
        * src/tracker-indexer/modules/evolution.c:
        * src/tracker-indexer/modules/files.c:
        * src/tracker-indexer/modules/gaim-conversations.c:
        * src/tracker-indexer/tracker-module.h: Fixed more warnings that were
        spotted with the new compiler flags.

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-log.c
   trunk/src/libtracker-data/tracker-rdf-query.c
   trunk/src/tracker-indexer/modules/applications.c
   trunk/src/tracker-indexer/modules/evolution-imap.h
   trunk/src/tracker-indexer/modules/evolution-pop.h
   trunk/src/tracker-indexer/modules/evolution.c
   trunk/src/tracker-indexer/modules/files.c
   trunk/src/tracker-indexer/modules/gaim-conversations.c
   trunk/src/tracker-indexer/tracker-module.h

Modified: trunk/src/libtracker-common/tracker-log.c
==============================================================================
--- trunk/src/libtracker-common/tracker-log.c	(original)
+++ trunk/src/libtracker-common/tracker-log.c	Wed Dec 17 10:58:53 2008
@@ -63,7 +63,11 @@
 	/* Check log size, 10MiB limit */
 	if (size > (10 << 20) && fd) {
 		rewind (fd);
-		ftruncate (fileno (fd), 0);
+
+		if (ftruncate (fileno (fd), 0) != 0) {
+			/* FIXME: What should we do if this fails? */
+		}
+
 		size = 0;
 	}
 

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Wed Dec 17 10:58:53 2008
@@ -1555,7 +1555,7 @@
                                   const gchar *value)
 {
  	TrackerField *field_def;
- 	gchar        *rdf_type;
+ 	gchar        *rdf_type = NULL;
  	gchar        *rdf_query;
  	
  	field_def = tracker_ontology_get_field_by_name (field);

Modified: trunk/src/tracker-indexer/modules/applications.c
==============================================================================
--- trunk/src/tracker-indexer/modules/applications.c	(original)
+++ trunk/src/tracker-indexer/modules/applications.c	Wed Dec 17 10:58:53 2008
@@ -25,9 +25,7 @@
 
 #include <glib.h>
 
-#include <tracker-indexer/tracker-module-file.h>
-
-#include <libtracker-data/tracker-data-metadata.h>
+#include <tracker-indexer/tracker-module.h>
 
 #define GROUP_DESKTOP_ENTRY "Desktop Entry"
 #define KEY_TYPE	    "Type"
@@ -64,7 +62,7 @@
         TrackerModuleFileClass parent_class;
 };
 
-
+static GType                   tracker_application_file_get_type      (void) G_GNUC_CONST;
 static TrackerModuleMetadata * tracker_application_file_get_metadata  (TrackerModuleFile *file);
 
 

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	Wed Dec 17 10:58:53 2008
@@ -62,9 +62,11 @@
         TrackerModuleFileClass parent_class;
 };
 
+GType               tracker_evolution_imap_file_get_type (void) G_GNUC_CONST;
+
 void                tracker_evolution_imap_file_register (GTypeModule *module);
 
-TrackerModuleFile * tracker_evolution_imap_file_new     (GFile *file);
+TrackerModuleFile * tracker_evolution_imap_file_new      (GFile *file);
 
 
 G_END_DECLS

Modified: trunk/src/tracker-indexer/modules/evolution-pop.h
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-pop.h	(original)
+++ trunk/src/tracker-indexer/modules/evolution-pop.h	Wed Dec 17 10:58:53 2008
@@ -58,6 +58,8 @@
         TrackerModuleFileClass parent_class;
 };
 
+GType               tracker_evolution_pop_file_get_type (void) G_GNUC_CONST;
+
 void                tracker_evolution_pop_file_register (GTypeModule *module);
 
 TrackerModuleFile * tracker_evolution_pop_file_new      (GFile *file);

Modified: trunk/src/tracker-indexer/modules/evolution.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution.c	Wed Dec 17 10:58:53 2008
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <tracker-indexer/tracker-module.h>
 
 #include "evolution-pop.h"
 #include "evolution-imap.h"

Modified: trunk/src/tracker-indexer/modules/files.c
==============================================================================
--- trunk/src/tracker-indexer/modules/files.c	(original)
+++ trunk/src/tracker-indexer/modules/files.c	Wed Dec 17 10:58:53 2008
@@ -31,9 +31,7 @@
 
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-ontology.h>
-
-#include <tracker-indexer/tracker-module-metadata-utils.h>
-#include <tracker-indexer/tracker-module-file.h>
+#include <tracker-indexer/tracker-module.h>
 
 /* This is ONLY needed for the indexer to run standalone with
  * the -p option, otherwise it will pick up all sorts of crap
@@ -57,6 +55,8 @@
 };
 
 
+static GType                   tracker_regular_file_get_type         (void) G_GNUC_CONST;
+
 static const gchar *           tracker_regular_file_get_service_type (TrackerModuleFile *file);
 static gchar *                 tracker_regular_file_get_text         (TrackerModuleFile *file);
 static TrackerModuleMetadata * tracker_regular_file_get_metadata     (TrackerModuleFile *file);

Modified: trunk/src/tracker-indexer/modules/gaim-conversations.c
==============================================================================
--- trunk/src/tracker-indexer/modules/gaim-conversations.c	(original)
+++ trunk/src/tracker-indexer/modules/gaim-conversations.c	Wed Dec 17 10:58:53 2008
@@ -21,10 +21,7 @@
 
 #include "config.h"
 
-#include <libtracker-data/tracker-data-metadata.h>
-
-#include <tracker-indexer/tracker-module-file.h>
-#include <tracker-indexer/tracker-module-iteratable.h>
+#include <tracker-indexer/tracker-module.h>
 
 #define GAIM_TYPE_FILE    (gaim_file_get_type ())
 #define GAIM_FILE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), GAIM_TYPE_FILE, GaimFile))
@@ -53,6 +50,8 @@
 };
 
 
+static GType         gaim_file_get_type         (void) G_GNUC_CONST;
+
 static void          gaim_file_iteratable_init  (TrackerModuleIteratableIface *iface);
 
 static void          gaim_file_finalize         (GObject           *object);

Modified: trunk/src/tracker-indexer/tracker-module.h
==============================================================================
--- trunk/src/tracker-indexer/tracker-module.h	(original)
+++ trunk/src/tracker-indexer/tracker-module.h	Wed Dec 17 10:58:53 2008
@@ -23,6 +23,7 @@
 #define __TRACKER_MODULE_H__
 
 #include <glib.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -33,6 +34,11 @@
 #include "tracker-module-metadata.h"
 #include "tracker-module-metadata-utils.h"
 
+void                indexer_module_initialize  (GTypeModule *module);
+void                indexer_module_shutdown    (void);
+TrackerModuleFile * indexer_module_create_file (GFile *file);
+
+
 #undef __TRACKER_MODULE_INSIDE__
 
 #endif /* __TRACKER_MODULE_H__ */