tracker r3094 - in trunk: . src/tracker-applet src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Mar 16 17:53:22 2009
New Revision: 3094
URL: http://svn.gnome.org/viewvc/tracker?rev=3094&view=rev

Log:
	* src/tracker-applet/tracker-applet.c: (filter_x_events):
	* src/trackerd/tracker-main.c: (main):
	* src/trackerd/tracker-processor.c: (item_queue_handlers_set_up):
	Use g_timeout_add_seconds() in preference to g_timeout_add().
	Fixes bug #573834 (Marcel Stimberg).


Modified:
   trunk/ChangeLog
   trunk/src/tracker-applet/tracker-applet.c
   trunk/src/trackerd/tracker-main.c
   trunk/src/trackerd/tracker-processor.c

Modified: trunk/src/tracker-applet/tracker-applet.c
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.c	(original)
+++ trunk/src/tracker-applet/tracker-applet.c	Mon Mar 16 17:53:22 2009
@@ -762,7 +762,7 @@
 	case MotionNotify:
 		if (ev->xmotion.is_hint) {
 			/* need to respond to hints so we continue to get events */
-			g_timeout_add (1000,
+			g_timeout_add_seconds (1,
 				       (GSourceFunc) query_pointer_timeout,
 				       GINT_TO_POINTER (ev->xmotion.window));
 		}

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Mon Mar 16 17:53:22 2009
@@ -1103,7 +1103,7 @@
 		if (seconds > 0) {
 			g_message ("Waiting %d seconds before starting",
 				   seconds);
-			g_timeout_add (seconds * 1000, start_cb, NULL);
+			g_timeout_add_seconds (seconds, start_cb, NULL);
 		} else {
 			g_idle_add (start_cb, NULL);
 		}

Modified: trunk/src/trackerd/tracker-processor.c
==============================================================================
--- trunk/src/trackerd/tracker-processor.c	(original)
+++ trunk/src/trackerd/tracker-processor.c	Mon Mar 16 17:53:22 2009
@@ -43,7 +43,7 @@
 
 #define TRACKER_PROCESSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_PROCESSOR, TrackerProcessorPrivate))
 
-#define ITEMS_QUEUE_PROCESS_INTERVAL 2000
+#define ITEMS_QUEUE_PROCESS_INTERVAL 2
 #define ITEMS_QUEUE_PROCESS_MAX      1000
 
 #define ITEMS_SIGNAL_TO_DAEMON_RATIO 500
@@ -751,7 +751,7 @@
 	}
 
 	processor->private->item_queues_handler_id =
-		g_timeout_add (ITEMS_QUEUE_PROCESS_INTERVAL,
+		g_timeout_add_seconds (ITEMS_QUEUE_PROCESS_INTERVAL,
 			       item_queue_handlers_cb,
 			       processor);
 }