tracker r1911 - in branches/indexer-split: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed Jul 23 08:32:49 2008
New Revision: 1911
URL: http://svn.gnome.org/viewvc/tracker?rev=1911&view=rev

Log:
2008-07-23  Philip Van Hoof  <pvanhoof gnome org>

        * src/trackerd/tracker-dbus.c: Style fixes
        * src/trackerd/tracker-xesam.c: Wrapped db related functions



Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-dbus.c
   branches/indexer-split/src/trackerd/tracker-xesam.c

Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c	Wed Jul 23 08:32:49 2008
@@ -48,6 +48,7 @@
 static DBusGProxy      *proxy;
 static DBusGProxy      *proxy_for_indexer;
 static GSList          *objects;
+static guint            pause_timeout = 0;
 
 static gboolean
 dbus_register_service (DBusGProxy  *proxy,
@@ -395,16 +396,14 @@
 }
 
 
-
-static guint pause_timeout = 0;
-
 static void 
 set_paused_reply (DBusGProxy *proxy, GError *error, gpointer userdata)
 {
+	return;
 }
 
 static gboolean
-tracker_indexer_pauzed (gpointer user_data)
+tracker_indexer_paused (gpointer user_data)
 {
 	DBusGProxy *proxy = user_data;
 
@@ -417,7 +416,7 @@
 }
 
 static void
-tracker_indexer_pauze_finished (gpointer user_data)
+tracker_indexer_pause_finished (gpointer user_data)
 {
 	DBusGProxy *proxy = user_data;
 	pause_timeout = 0;
@@ -447,9 +446,9 @@
 			/* Activate a pause */
 			pause_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
 							    10 * 1000 /* 10 seconds */,
-							    tracker_indexer_pauzed,
+							    tracker_indexer_paused,
 							    g_object_ref (proxy),
-							    tracker_indexer_pauze_finished);
+							    tracker_indexer_pause_finished);
 		} else {
 			/* Should we do something useful with error here? */
 			g_error_free (error);

Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c	Wed Jul 23 08:32:49 2008
@@ -202,6 +202,9 @@
 	gboolean  insert = FALSE;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	key = dbus_g_method_get_sender (context);
 
 	if (!sessions)
@@ -241,6 +244,8 @@
 	g_free (session_id);
 	g_free (key);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -254,6 +259,7 @@
 	guint   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
 	key = dbus_g_method_get_sender (context);
 	tracker_xesam_close_session_interal (session_id, &error);
 
@@ -393,6 +399,9 @@
 	guint                request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	session = tracker_xesam_manager_get_session (session_id, &error);
 
 	if (session) {
@@ -428,6 +437,8 @@
 	if (session)
 		g_object_unref (session);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -441,6 +452,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -462,6 +476,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -475,6 +491,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -498,6 +517,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -533,6 +554,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -562,6 +586,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -577,6 +603,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -607,6 +636,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -623,6 +654,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -653,6 +687,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -669,6 +705,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -700,6 +739,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }
 
@@ -713,6 +754,9 @@
 	guint                   request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
+
+	tracker_indexer_pause ();
+
 	search = tracker_xesam_manager_get_live_search (search_id, &error);
 
 	if (search) {
@@ -734,6 +778,8 @@
 	if (search)
 		g_object_unref (search);
 
+	tracker_indexer_continue ();
+
 	tracker_dbus_request_success (request_id);
 }