[tracker/gdbus-evolution] plugins/evolution: Add ?uid=x to the nie:url of Evolution E-mails

[Philip Van Hoof <pvanhoof src gnome org>]

commit 7c4569ed3506769f88fc986746434b10401e4117
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Oct 28 10:40:14 2010 +0200

    plugins/evolution: Add ?uid=x to the nie:url of Evolution E-mails

 src/plugins/evolution/tracker-evolution-plugin.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 2da77da..26b3c1b 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -649,18 +649,25 @@ convert_url_to_whatever (CamelURL *a_url, const gchar *path, const gchar *uid)
 	gchar *uri, *qry, *ppath = g_strdup_printf ("/%s", path);
 
 	url = camel_url_copy (a_url);
-	qry = g_strdup_printf ("uid=%s", uid);
-	camel_url_set_query (url, qry);
-	g_free (qry);
+
+	/* This would be the right way, but em_uri_from_camel ignores ?uid=x parts,
+	 * so instead we append it manually with a g_strdup_printf lower
+	 *
+	 * qry = g_strdup_printf ("uid=%s", uid);
+	 * camel_url_set_query (url, qry);
+	 * g_free (qry); */
+
 	camel_url_set_path (url, ppath);
 	g_free (ppath);
 	uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
 
 	qry = em_uri_from_camel (uri);
 	g_free (uri);
+	uri = g_strdup_printf ("%s?uid=%s", qry, uid);
+	g_free (qry);
 	camel_url_free (url);
 
-	return qry;
+	return uri;
 }
 
 /* When new messages arrive to- or got deleted from the summary, called in