18589N/Acommit ef7c18e2f68d5b175945f60eff2137a4850a6a93

18589N/AAuthor: Halton Huo <halton.huo@sun.com>

18589N/ADate: Mon Mar 29 17:14:02 2010 +0800

18589N/A

18589N/A Strip arguments defined in /desktop/gnome/url-handlers/mailto/command.

18589N/A

18589N/A Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=614222

18589N/A

18589N/Adiff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c

18589N/Aindex a25ade1..45b4b25 100644

18589N/A--- a/src/plugins/evolution/evolution.c

18589N/A+++ b/src/plugins/evolution/evolution.c

18589N/A@@ -81,6 +81,8 @@ static gboolean

18589N/A init (NstPlugin *plugin)

18589N/A {

18589N/A GConfClient *client;

18589N/A+ gchar *str;

18589N/A+ gchar **arrstr;

18589N/A

18589N/A g_print ("Init evolution plugin\n");

18589N/A

18589N/A@@ -88,9 +90,14 @@ init (NstPlugin *plugin)

18589N/A bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

18589N/A

18589N/A client = gconf_client_get_default ();

18589N/A- mail_cmd = gconf_client_get_string (client, DEFAULT_MAILTO, NULL);

18589N/A+ str = gconf_client_get_string (client, DEFAULT_MAILTO, NULL);

18589N/A g_object_unref (client);

18589N/A

18589N/A+ arrstr = g_strsplit (str, " ", -1);

18589N/A+ mail_cmd = g_strdup (arrstr [0]);

18589N/A+ g_free (str);

18589N/A+ g_strfreev (arrstr);

18589N/A+

18589N/A if (mail_cmd == NULL || *mail_cmd == '\0') {

18589N/A g_free (mail_cmd);

18589N/A mail_cmd = get_evo_cmd ();

18589N/A@@ -339,7 +346,7 @@ send_files (NstPlugin *plugin,

18589N/A get_evo_mailto (contact_widget, mailto, file_list);

18589N/A }

18589N/A

18589N/A- cmd = g_strdup_printf (mail_cmd, mailto->str);

18589N/A+ cmd = g_strdup_printf ("%s %s", mail_cmd, mailto->str);

18589N/A g_string_free (mailto, TRUE);

18589N/A

18589N/A g_message ("Mailer type: %d", type);