[tracker] Timeouts for DBusGProxy connections to Tracker

[Philip Van Hoof <pvanhoof src gnome org>]

commit 19f95b28095e5471a04607e6876670fdc1fa2d45
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Jul 14 14:30:42 2009 +0200

    Timeouts for DBusGProxy connections to Tracker

 src/libtracker-gtk/tracker-keyword-store.c    |    2 +-
 src/libtracker-gtk/tracker-metadata-tile.c    |    2 +-
 src/libtracker-gtk/tracker-tag-bar.c          |    2 +-
 src/libtracker/tracker.c                      |    6 +++++-
 src/libtracker/tracker.h                      |    3 ++-
 src/tracker-applet/tracker-applet.c           |    2 +-
 src/tracker-miner-fs/tracker-indexer.c        |    2 +-
 src/tracker-preferences/tracker-preferences.c |    2 +-
 src/tracker-search-tool/tracker-search-tool.c |    2 +-
 src/tracker-utils/tracker-import.c            |    3 ++-
 src/tracker-utils/tracker-info.c              |    2 +-
 src/tracker-utils/tracker-search.c            |    2 +-
 src/tracker-utils/tracker-sparql.c            |    2 +-
 src/tracker-utils/tracker-stats.c             |    2 +-
 src/tracker-utils/tracker-status.c            |    2 +-
 src/tracker-utils/tracker-tag.c               |    2 +-
 16 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/src/libtracker-gtk/tracker-keyword-store.c b/src/libtracker-gtk/tracker-keyword-store.c
index 07a5357..bafd072 100644
--- a/src/libtracker-gtk/tracker-keyword-store.c
+++ b/src/libtracker-gtk/tracker-keyword-store.c
@@ -66,7 +66,7 @@ tracker_keyword_store_init (TrackerKeywordStore *store)
 
 	//setup private members
 	store->keywords = g_hash_table_new (g_str_hash, g_str_equal);
-	store->tracker_client = tracker_connect (TRUE);
+	store->tracker_client = tracker_connect (TRUE, -1);
 
 	/* TODO: Port to SPARQL */
 #if 0
diff --git a/src/libtracker-gtk/tracker-metadata-tile.c b/src/libtracker-gtk/tracker-metadata-tile.c
index 973035c..696afb9 100644
--- a/src/libtracker-gtk/tracker-metadata-tile.c
+++ b/src/libtracker-gtk/tracker-metadata-tile.c
@@ -1354,7 +1354,7 @@ tracker_metadata_tile_new (void)
 	tile = g_object_new (TRACKER_TYPE_METADATA_TILE, NULL);
 	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
 
-	client = tracker_connect (TRUE);
+	client = tracker_connect (TRUE, -1);
 	priv->client = client;
 	return tile;
 }
diff --git a/src/libtracker-gtk/tracker-tag-bar.c b/src/libtracker-gtk/tracker-tag-bar.c
index 9fc6e00..26c6b0b 100644
--- a/src/libtracker-gtk/tracker-tag-bar.c
+++ b/src/libtracker-gtk/tracker-tag-bar.c
@@ -451,7 +451,7 @@ tracker_tag_bar_new (void)
 				NULL);
 	priv = TRACKER_TAG_BAR_GET_PRIVATE (tag_bar);
 
-	client = tracker_connect (TRUE);
+	client = tracker_connect (TRUE, -1);
 	priv->client = client;
 	return tag_bar;
 }
diff --git a/src/libtracker/tracker.c b/src/libtracker/tracker.c
index a5068e2..aaa63d5 100644
--- a/src/libtracker/tracker.c
+++ b/src/libtracker/tracker.c
@@ -129,7 +129,7 @@ tracker_sparql_escape (const gchar *str)
 }
 
 TrackerClient *
-tracker_connect (gboolean enable_warnings)
+tracker_connect (gboolean enable_warnings, gint timeout)
 {
 	DBusGConnection *connection;
 	GError *error = NULL;
@@ -161,6 +161,10 @@ tracker_connect (gboolean enable_warnings)
                                            TRACKER_OBJECT "/Resources",
                                            TRACKER_INTERFACE_RESOURCES);
 
+	if (timeout > 0) {
+		dbus_g_proxy_set_default_timeout (client->proxy_resources, timeout);
+	}
+
 	return client;
 }
 
diff --git a/src/libtracker/tracker.h b/src/libtracker/tracker.h
index 661aa69..fb384cd 100644
--- a/src/libtracker/tracker.h
+++ b/src/libtracker/tracker.h
@@ -42,7 +42,8 @@ void           tracker_cancel_last_call                    (TrackerClient
 
 gchar *        tracker_sparql_escape                       (const gchar            *str);
 
-TrackerClient *tracker_connect                             (gboolean                enable_warnings);
+TrackerClient *tracker_connect                             (gboolean                enable_warnings,
+                                                            gint                    timeout);
 void           tracker_disconnect                          (TrackerClient          *client);
 
 /* Synchronous API */
diff --git a/src/tracker-applet/tracker-applet.c b/src/tracker-applet/tracker-applet.c
index 9b2a518..2e12815 100644
--- a/src/tracker-applet/tracker-applet.c
+++ b/src/tracker-applet/tracker-applet.c
@@ -1853,7 +1853,7 @@ setup_dbus_connection (TrayIcon *icon)
 
 	priv = TRAY_ICON_GET_PRIVATE (icon);
 
-	priv->tracker = tracker_connect (FALSE);
+	priv->tracker = tracker_connect (FALSE, -1);
 
 	if (!priv->tracker) {
 		g_critical ("Could not connect to the Tracker daemon\n");
diff --git a/src/tracker-miner-fs/tracker-indexer.c b/src/tracker-miner-fs/tracker-indexer.c
index 70ec11c..06b2b45 100644
--- a/src/tracker-miner-fs/tracker-indexer.c
+++ b/src/tracker-miner-fs/tracker-indexer.c
@@ -916,7 +916,7 @@ tracker_indexer_init (TrackerIndexer *indexer)
 	priv->modules_queue = g_queue_new ();
 	priv->config = tracker_config_new ();
 
-	priv->client = tracker_connect (TRUE);
+	priv->client = tracker_connect (TRUE, -1);
 
 #ifdef HAVE_HAL
 	priv->storage = tracker_storage_new ();
diff --git a/src/tracker-preferences/tracker-preferences.c b/src/tracker-preferences/tracker-preferences.c
index 728ada0..2a5b3b4 100644
--- a/src/tracker-preferences/tracker-preferences.c
+++ b/src/tracker-preferences/tracker-preferences.c
@@ -215,7 +215,7 @@ if_tracker_store_start (TrackerPreferencesPrivate *priv)
 	TrackerClient *client;
 	gchar *status;
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		return FALSE;
diff --git a/src/tracker-search-tool/tracker-search-tool.c b/src/tracker-search-tool/tracker-search-tool.c
index 94c370b..6f6758d 100644
--- a/src/tracker-search-tool/tracker-search-tool.c
+++ b/src/tracker-search-tool/tracker-search-tool.c
@@ -2323,7 +2323,7 @@ main (gint argc,
 
 	gtk_widget_show (gsearch->window);
 
-	tracker_client = tracker_connect (FALSE);
+	tracker_client = tracker_connect (FALSE, -1);
 
 	tracker_search_setup_gconf_notifications (gsearch);
 
diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c
index 2cb644a..0507bec 100644
--- a/src/tracker-utils/tracker-import.c
+++ b/src/tracker-utils/tracker-import.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <locale.h>
+#include <stdint.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -79,7 +80,7 @@ main (int argc, char **argv)
 
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, INT_MAX);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index 6f47372..6ee330d 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -107,7 +107,7 @@ main (int argc, char **argv)
 
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index 5851556..e05aee1 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -130,7 +130,7 @@ main (int argc, char **argv)
 
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index efca6e3..53f6812 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -113,7 +113,7 @@ main (int argc, char **argv)
 
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-stats.c b/src/tracker-utils/tracker-stats.c
index 86e51c4..727e4ac 100644
--- a/src/tracker-utils/tracker-stats.c
+++ b/src/tracker-utils/tracker-stats.c
@@ -71,7 +71,7 @@ main (int argc, char **argv)
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index 96b50ad..c20d396 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -471,7 +471,7 @@ main (gint argc, gchar *argv[])
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 614eaf0..5a573d6 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -172,7 +172,7 @@ main (int argc, char **argv)
 
 	g_option_context_free (context);
 
-	client = tracker_connect (FALSE);
+	client = tracker_connect (FALSE, -1);
 
 	if (!client) {
 		g_printerr ("%s\n",