tracker r1836 - in branches/indexer-split: . src/tracker-indexer src/tracker-indexer/modules

[carlosg svn gnome org]

Author: carlosg
Date: Wed Jul  2 16:52:04 2008
New Revision: 1836
URL: http://svn.gnome.org/viewvc/tracker?rev=1836&view=rev

Log:
2008-07-02  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-module.h: Remove get_directories() and
        get_ignore_directories() from modules API. The data specified in the
        .module file will be used.
        * src/tracker-indexer/tracker-indexer-module.[ch]: Remove internal
        API for these as well.
        * src/tracker-indexer/applications.c:
        * src/tracker-indexer/dummy.c:
        * src/tracker-indexer/evolution.c:
        * src/tracker-indexer/files.c:
        * src/tracker-indexer/gaim-conversations.c: Remove the corresponding
        functions in modules.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/modules/applications.c
   branches/indexer-split/src/tracker-indexer/modules/dummy.c
   branches/indexer-split/src/tracker-indexer/modules/evolution.c
   branches/indexer-split/src/tracker-indexer/modules/files.c
   branches/indexer-split/src/tracker-indexer/modules/gaim-conversations.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h
   branches/indexer-split/src/tracker-indexer/tracker-module.h

Modified: branches/indexer-split/src/tracker-indexer/modules/applications.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/applications.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/applications.c	Wed Jul  2 16:52:04 2008
@@ -49,49 +49,6 @@
 	return "Applications";
 }
 
-gchar **
-tracker_module_get_directories (void)
-{
-	GPtrArray *dirs;
-	gchar *value, *dir;
-
-	dirs = g_ptr_array_new ();
-	value = getenv ("XDG_DATA_HOME");
-
-	if (value) {
-		dir = g_build_filename (value, "applications", NULL);
-	} else {
-		dir = g_build_filename (g_get_home_dir (), ".local/share/applications", NULL);
-	}
-
-	/* Add user defined applications path to service directory list */
-	g_ptr_array_add (dirs, dir);
-
-	/* Add system defined applications path to service directory list */
-	value = getenv ("XDG_DATA_DIRS");
-
-	if (value) {
-		gchar **dir_array;
-		gint i;
-
-		dir_array = g_strsplit (value, ":", 0);
-
-		for (i = 0; dir_array[i]; i++) {
-			dir = g_build_filename (dir_array[i], "applications", NULL);
-			g_ptr_array_add (dirs, dir);
-		}
-
-		g_strfreev (dir_array);
-	} else {
-		g_ptr_array_add (dirs, g_strdup ("/usr/share/applications"));
-		g_ptr_array_add (dirs, g_strdup ("/usr/local/share/applications"));
-	}
-
-	g_ptr_array_add (dirs, NULL);
-
-	return (gchar **) g_ptr_array_free (dirs, FALSE);
-}
-
 static void
 insert_data_from_desktop_file (GHashTable  *metadata,
 			       const gchar *metadata_key,

Modified: branches/indexer-split/src/tracker-indexer/modules/dummy.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/dummy.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/dummy.c	Wed Jul  2 16:52:04 2008
@@ -19,6 +19,24 @@
 
 #include <glib.h>
 
+void
+tracker_module_init (void)
+{
+        /* Implementing this function is optional.
+         *
+         * Allocate here all static resources for the module.
+         */
+}
+
+void
+tracker_module_shutdown (void)
+{
+        /* Implementing this function is optional.
+         *
+         * Free here all resources allocated in tracker_module_init()
+         */
+}
+
 G_CONST_RETURN gchar *
 tracker_module_get_name (void)
 {
@@ -26,13 +44,6 @@
 	return "Dummy";
 }
 
-gchar **
-tracker_module_get_directories (void)
-{
-	/* Return directories/files (a NULL-ended array of gchar*) to scan */
-	return NULL;
-}
-
 gpointer
 tracker_module_file_get_data (const gchar *path)
 {

Modified: branches/indexer-split/src/tracker-indexer/modules/evolution.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/evolution.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/evolution.c	Wed Jul  2 16:52:04 2008
@@ -351,18 +351,6 @@
         g_slist_free (list);
 }
 
-gchar **
-tracker_module_get_directories (void)
-{
-        gchar **dirs;
-
-        dirs = g_new0 (gchar *, 3);
-        dirs[0] = g_strdup (local_dir);
-        dirs[1] = g_strdup (imap_dir);
-
-        return dirs;
-}
-
 static MailStorageType
 get_mail_storage_type_from_path (const gchar *path)
 {

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	Wed Jul  2 16:52:04 2008
@@ -50,50 +50,6 @@
 	return "Files";
 }
 
-gchar **
-tracker_module_get_directories (void)
-{
-	GSList *watch_roots;
-	GPtrArray *dirs;
-
-	if (!config) {
-		config = tracker_config_new ();
-	}
-
-	watch_roots = tracker_config_get_watch_directory_roots (config);
-	dirs = g_ptr_array_new ();
-
-	for (; watch_roots; watch_roots = watch_roots->next) {
-		g_ptr_array_add (dirs, g_strdup (watch_roots->data));
-	}
-
-	g_ptr_array_add (dirs, NULL);
-
-	return (gchar **) g_ptr_array_free (dirs, FALSE);
-}
-
-gchar **
-tracker_module_get_ignore_directories (void)
-{
-	GSList *ignore_roots;
-	GPtrArray *dirs;
-
-	if (!config) {
-		config = tracker_config_new ();
-	}
-
-	ignore_roots = tracker_config_get_no_watch_directory_roots (config);
-	dirs = g_ptr_array_new ();
-
-	for (; ignore_roots; ignore_roots = ignore_roots->next) {
-		g_ptr_array_add (dirs, g_strdup (ignore_roots->data));
-	}
-
-	g_ptr_array_add (dirs, NULL);
-
-	return (gchar **) g_ptr_array_free (dirs, FALSE);
-}
-
 void
 tracker_metadata_get_embedded (const char *path,
 			       const char *mimetype,

Modified: branches/indexer-split/src/tracker-indexer/modules/gaim-conversations.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/gaim-conversations.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/gaim-conversations.c	Wed Jul  2 16:52:04 2008
@@ -26,18 +26,6 @@
 	return "GaimConversations";
 }
 
-gchar **
-tracker_module_get_directories (void)
-{
-	gchar **log_directories;
-
-	log_directories = g_new0 (gchar*, 3);
-	log_directories[0] = g_build_filename (g_get_home_dir(), ".gaim", "logs", NULL);
-	log_directories[1] = g_build_filename (g_get_home_dir(), ".purple", "logs", NULL);
-
-	return log_directories;
-}
-
 GHashTable *
 tracker_module_get_file_metadata (const gchar *file)
 {

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c	Wed Jul  2 16:52:04 2008
@@ -80,30 +80,6 @@
 	return NULL;
 }
 
-gchar **
-tracker_indexer_module_get_directories (GModule *module)
-{
-	TrackerModuleGetDirectoriesFunc func;
-
-	if (g_module_symbol (module, "tracker_module_get_directories", (gpointer *) &func)) {
-		return (func) ();
-        }
-
-	return NULL;
-}
-
-gchar **
-tracker_indexer_module_get_ignore_directories (GModule *module)
-{
-	TrackerModuleGetDirectoriesFunc func;
-
-	if (g_module_symbol (module, "tracker_module_get_ignore_directories", (gpointer *) &func)) {
-		return (func) ();
-        }
-
-	return NULL;
-}
-
 TrackerFile *
 tracker_indexer_module_file_new (GModule     *module,
 				 const gchar *path)

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h	Wed Jul  2 16:52:04 2008
@@ -33,8 +33,6 @@
 void                    tracker_indexer_module_shutdown               (GModule     *module);
 
 G_CONST_RETURN gchar *  tracker_indexer_module_get_name               (GModule     *module);
-gchar **                tracker_indexer_module_get_directories        (GModule     *module);
-gchar **                tracker_indexer_module_get_ignore_directories (GModule     *module);
 
 TrackerFile *           tracker_indexer_module_file_new               (GModule     *module,
 								       const gchar *path);

Modified: branches/indexer-split/src/tracker-indexer/tracker-module.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-module.h	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-module.h	Wed Jul  2 16:52:04 2008
@@ -49,8 +49,6 @@
 void                   tracker_module_shutdown               (void);
 
 G_CONST_RETURN gchar * tracker_module_get_name               (void);
-gchar **               tracker_module_get_directories        (void);
-gchar **               tracker_module_get_ignore_directories (void);
 
 gpointer               tracker_module_file_get_data  (const gchar *path);
 void                   tracker_module_file_free_data (gpointer     file_data);