tracker r2870 - in trunk: . src/libtracker-common src/tracker-extract src/tracker-indexer src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri Jan 30 16:28:53 2009
New Revision: 2870
URL: http://svn.gnome.org/viewvc/tracker?rev=2870&view=rev

Log:
2009-01-30  Philip Van Hoof  <philip codeminded be>

	* src/tracker-indexer/tracker-main.c
	* src/trackerd/tracker-main.c
	* src/tracker-extract/tracker-extract.c
	* src/libtracker-common/tracker-thumbnailer.c
	* src/libtracker-common/tracker-thumbnailer.h: No timeout to wait
	for for tracker-extract



Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-thumbnailer.c
   trunk/src/libtracker-common/tracker-thumbnailer.h
   trunk/src/tracker-extract/tracker-extract.c
   trunk/src/tracker-indexer/tracker-main.c
   trunk/src/trackerd/tracker-main.c

Modified: trunk/src/libtracker-common/tracker-thumbnailer.c
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.c	(original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.c	Fri Jan 30 16:28:53 2009
@@ -55,6 +55,7 @@
 	guint request_id;
 	guint timeout_id;
 	guint count;
+	guint timeout_seconds;
 
 	gboolean service_is_available;
 	gboolean service_is_enabled;
@@ -213,7 +214,7 @@
 }
 
 void
-tracker_thumbnailer_init (TrackerConfig *config)
+tracker_thumbnailer_init (TrackerConfig *config, guint timeout_seconds)
 {
 	TrackerThumbnailerPrivate *private;
 	DBusGConnection *connection;
@@ -226,6 +227,7 @@
 
 	private->config = g_object_ref (config);
 	private->service_is_enabled = tracker_config_get_enable_thumbnails (private->config);
+	private->timeout_seconds = timeout_seconds;
 
 	g_signal_connect (private->config, "notify::enable-thumbnails",
 			  G_CALLBACK (thumbnailer_enabled_cb), 
@@ -507,10 +509,14 @@
 	
 	private->count++;
 	
-	if (private->timeout_id == 0) {
-		private->timeout_id = 
-			g_timeout_add_seconds (30, 
-					       thumbnailer_request_timeout_cb, 
-					       NULL);
+	if (private->timeout_seconds != 0) {
+		if (private->timeout_id == 0) {
+			private->timeout_id = 
+				g_timeout_add_seconds (private->timeout_seconds, 
+						       thumbnailer_request_timeout_cb, 
+						       NULL);
+		}
+	} else {
+		thumbnailer_request_timeout_cb (NULL);
 	}
 }

Modified: trunk/src/libtracker-common/tracker-thumbnailer.h
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.h	(original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.h	Fri Jan 30 16:28:53 2009
@@ -26,7 +26,8 @@
 
 G_BEGIN_DECLS
 
-void tracker_thumbnailer_init               (TrackerConfig *config);
+void tracker_thumbnailer_init               (TrackerConfig *config,
+					     guint timeout_seconds);
 void tracker_thumbnailer_shutdown           (void);
 
 void tracker_thumbnailer_get_file_thumbnail (const gchar   *path,

Modified: trunk/src/tracker-extract/tracker-extract.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract.c	(original)
+++ trunk/src/tracker-extract/tracker-extract.c	Fri Jan 30 16:28:53 2009
@@ -417,7 +417,7 @@
 	}
 
 	config = tracker_config_new ();
-	tracker_thumbnailer_init (config);
+	tracker_thumbnailer_init (config, 0);
 
 	main_loop = g_main_loop_new (NULL, FALSE);
 

Modified: trunk/src/tracker-indexer/tracker-main.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-main.c	(original)
+++ trunk/src/tracker-indexer/tracker-main.c	Fri Jan 30 16:28:53 2009
@@ -368,8 +368,8 @@
 			  G_CALLBACK (indexer_finished_cb),
 			  NULL);
 
-        /* Set up connections to the thumbnailer if supported */
-        tracker_thumbnailer_init (config);
+	/* Set up connections to the thumbnailer if supported */
+	tracker_thumbnailer_init (config, 10);
 
 	if (process_all) {
 		/* Tell the indexer to process all configured modules */

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Fri Jan 30 16:28:53 2009
@@ -1036,7 +1036,7 @@
 	tracker_module_config_init ();
 
 	tracker_turtle_init ();
-	tracker_thumbnailer_init (config);
+	tracker_thumbnailer_init (config, 30);
 
 	flags |= TRACKER_DB_MANAGER_REMOVE_CACHE;
 	index_flags |= TRACKER_DB_INDEX_MANAGER_READONLY;