X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=libmodest-dbus-client%2Flibmodest-dbus-client.c;h=b483dc704b9a3d4ce575f61c8dfbbd851277b0e6;hp=35041ac8ca30ac2e07955331dbc48a646d48cac8;hb=4bff54e275785cc7e7f2edd32ac17f8771d104ac;hpb=e6c15ff3a67bade0c250e1b90e7cf719b0d736c5

diff --git a/libmodest-dbus-client/libmodest-dbus-client.c b/libmodest-dbus-client/libmodest-dbus-client.c
index 35041ac..b483dc7 100644
--- a/libmodest-dbus-client/libmodest-dbus-client.c
+++ b/libmodest-dbus-client/libmodest-dbus-client.c
@@ -44,24 +44,26 @@ static gchar* get_attachments_string (GSList *attachments)
 {
 	if (!attachments)
 		return NULL;
-		
+
 	gchar *attachments_str = g_strdup("");
-	
+
 	GSList *iter = attachments;
 	while (iter)
 	{
 		if (iter->data) {
-			gchar *tmp = g_strconcat(attachments_str, ",", (gchar *) (iter->data), NULL);
+			gchar *escaped;
+			gchar *tmp;
+			escaped = g_uri_escape_string ((const gchar *) (iter->data), NULL, TRUE);
+			tmp = g_strconcat(attachments_str, ",", escaped, NULL);
+			g_free(escaped);
 			g_free(attachments_str);
 			attachments_str = tmp;
 		}
-		
 		iter = g_slist_next(iter);
 	}
-	
 	return attachments_str;
 }
-	
+
 /**
  * libmodest_dbus_client_mail_to:
  * @osso_context: a valid #osso_context_t object.
@@ -77,7 +79,7 @@ static gchar* get_attachments_string (GSList *attachments)
 gboolean 
 libmodest_dbus_client_mail_to (osso_context_t *osso_context, const gchar *mailto_uri)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 	const osso_return_t ret = osso_rpc_run_with_defaults(osso_context, 
 		   MODEST_DBUS_NAME, 
 		   MODEST_DBUS_METHOD_MAIL_TO, &retval, 
@@ -117,7 +119,7 @@ gboolean
 libmodest_dbus_client_compose_mail (osso_context_t *osso_context, const gchar *to, const gchar *cc, 
 	const gchar *bcc, const gchar* subject, const gchar* body, GSList *attachments)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 
 	gchar *attachments_str = get_attachments_string(attachments);
 
@@ -162,7 +164,7 @@ libmodest_dbus_client_compose_mail (osso_context_t *osso_context, const gchar *t
 gboolean 
 libmodest_dbus_client_open_message (osso_context_t *osso_context, const gchar *mail_uri)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 	const osso_return_t ret = osso_rpc_run_with_defaults(osso_context, 
 		   MODEST_DBUS_NAME, 
 		   MODEST_DBUS_METHOD_OPEN_MESSAGE, &retval, 
@@ -184,7 +186,7 @@ libmodest_dbus_client_open_message (osso_context_t *osso_context, const gchar *m
 gboolean 
 libmodest_dbus_client_send_and_receive (osso_context_t *osso_context)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 	const osso_return_t ret = osso_rpc_run_with_defaults(osso_context, 
 		   MODEST_DBUS_NAME, 
 		   MODEST_DBUS_METHOD_SEND_RECEIVE, &retval, 
@@ -205,7 +207,7 @@ libmodest_dbus_client_send_and_receive (osso_context_t *osso_context)
 gboolean 
 libmodest_dbus_client_open_default_inbox (osso_context_t *osso_context)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 	const osso_return_t ret = osso_rpc_run_with_defaults(osso_context, 
 		   MODEST_DBUS_NAME, 
 		   MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX, &retval, 
@@ -227,7 +229,7 @@ gboolean
 libmodest_dbus_client_open_account (osso_context_t *osso_context,
 				    const gchar *account_id)
 {
-	osso_rpc_t retval;
+	osso_rpc_t retval = { 0 };
 	const osso_return_t ret =
 		osso_rpc_run_with_defaults(osso_context,
 					   MODEST_DBUS_NAME,
@@ -262,7 +264,7 @@ gboolean
 libmodest_dbus_client_delete_message (osso_context_t   *osso_ctx,
 				      const char       *msg_uri)
 {
-	osso_rpc_t    retval;
+	osso_rpc_t    retval = { 0 };
 	osso_return_t ret;
        
 	ret = osso_rpc_run_with_defaults (osso_ctx,