[evolution-rss] fix gdbus outstanding issues

[Lucian Langa <lucilanga src gnome org>]

commit 0ac7e02b4551bd271e5e17c73eb6975173abc6b9
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri Nov 5 23:48:23 2010 +0200

    fix gdbus outstanding issues

 src/dbus.c                 |    8 +++-----
 src/evolution-import-rss.c |    5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/dbus.c b/src/dbus.c
index 7a7ce93..a671f19 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -91,16 +91,14 @@ signal_cb (GDBusConnection *connection,
 	if (!g_strcmp0 (signal_name, "import")) {
 		gchar *url = NULL;
 		add_feed *feed = g_new0(add_feed, 1);
-		g_variant_get (parameters, "((s))", &url);
+		g_variant_get (parameters, "(s)", &url);
 		g_print("New Feed received: %s\n", url);
-		feed->feed_url = g_strdup(url);
+		feed->feed_url = url;
 		feed->add=1;
 		feed->enabled=feed->validate=1;
 		feed->fetch_html = 0;
-		if (feed->feed_url && strlen(feed->feed_url)) {
-			gchar *text = feed->feed_url;
+		if (feed->feed_url) {
 			feed->feed_url = sanitize_url(feed->feed_url);
-			g_free(text);
 			d("sanitized feed URL: %s\n", feed->feed_url);
 			if (g_hash_table_find(rf->hr, check_if_match, feed->feed_url)) {
 				rss_error(NULL, NULL, _("Error adding feed."),
diff --git a/src/evolution-import-rss.c b/src/evolution-import-rss.c
index f7bb1cc..2752bde 100644
--- a/src/evolution-import-rss.c
+++ b/src/evolution-import-rss.c
@@ -88,7 +88,7 @@ send_dbus_message (const char *name, const char *data)
 	builder = g_variant_builder_new (G_VARIANT_TYPE_TUPLE);
 
 	/* Appends the data as an argument to the message */
-	g_variant_builder_add (builder, "(s)", data);
+	g_variant_builder_add (builder, "s", data);
 	g_dbus_message_set_body (message, g_variant_builder_end (builder));
 
 	/* Sends the message */
@@ -188,9 +188,8 @@ no_evo_cb (gpointer user_data)
 		system("evolution&");
 		g_usleep(30);
 		send_dbus_ping ();
-		return TRUE;
-	} else
 		return FALSE;
+	}
 }