nautilus-sendto r396 - in trunk: . src/plugins/balsa src/plugins/evolution src/plugins/sylpheed-claws src/plugins/thunderbird

[hadess svn gnome org]

Author: hadess
Date: Mon Feb  9 11:10:09 2009
New Revision: 396
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=396&view=rev

Log:
2009-02-09  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* src/plugins/balsa/*:
	* src/plugins/sylpheed-claws/*:
	* src/plugins/thunderbird/*: Remove the separate mailer
	plugins, and only use the evolution one instead

	* src/plugins/evolution/evolution.c (get_evo_cmd), (init),
	(get_evo_mailto), (get_balsa_mailto), (get_thunderbird_mailto),
	(get_sylpheed_mailto), (send_files), (destroy):
	Try to guess the default mailer from the GNOME default mailto:
	handler. When the mailer can't be guessed, fallback to using
	evolution instead.
	When the mailer is known, use its specific function to
	create the arugments that will allow sending files.

	(Closes: #318052)



Removed:
   trunk/src/plugins/balsa/
   trunk/src/plugins/sylpheed-claws/
   trunk/src/plugins/thunderbird/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/plugins/evolution/evolution.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb  9 11:10:09 2009
@@ -71,7 +71,7 @@
 AC_SUBST(NAUTILUS_EXTENSION_DIR)
 
 # The full list of plugins
-allowed_plugins="balsa bluetooth empathy evolution gaim gajim nautilus-burn pidgin removable-devices sylpheed-claws thunderbird upnp"
+allowed_plugins="bluetooth empathy evolution gaim gajim nautilus-burn pidgin removable-devices upnp"
 
 plugin_error_or_ignore()
 {
@@ -122,9 +122,6 @@
 	add_plugin="1"
 
 	case ${plugin} in
-		balsa)
-			add_plugin="1"
-		;;
 		bluetooth)
 			PKG_CHECK_MODULES(BLUETOOTH, dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
 					  enable_bluetooth=yes, enable_bluetooth=no)
@@ -234,23 +231,6 @@
 				add_plugin="0"
 			fi
 		;;
-		sylpheed-claws)
-			add_plugin="1"
-		;;
-		thunderbird)
-			AC_ARG_WITH([thunderbird-name],
-				    [AS_HELP_STRING([--with-thunderbird-name],[Binary name for Thunderbird (default: thunderbird)])],
-				    [with_thunderbird_name=$withval])
-			if test "x$with_thunderbird_name" = "x" ; then
-				with_thunderbird_name=thunderbird
-			fi
-			THUNDERBIRD_NAME=$with_thunderbird_name
-			AC_SUBST(THUNDERBIRD_NAME)
-
-			AC_DEFINE_UNQUOTED(THUNDERBIRD_NAME, "$THUNDERBIRD_NAME", [name of the Thunderbird binary])
-
-			add_plugin="1"
-		;;
 		upnp)
 			PKG_CHECK_MODULES(UPNP, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED,
 					  enable_upnp=yes, enable_upnp=no)
@@ -310,7 +290,6 @@
 Makefile
 src/Makefile
 src/plugins/Makefile
-src/plugins/balsa/Makefile
 src/plugins/bluetooth/Makefile
 src/plugins/empathy/Makefile
 src/plugins/evolution/Makefile
@@ -319,8 +298,6 @@
 src/plugins/nautilus-burn/Makefile
 src/plugins/pidgin/Makefile
 src/plugins/removable-devices/Makefile
-src/plugins/sylpheed-claws/Makefile
-src/plugins/thunderbird/Makefile
 src/plugins/upnp/Makefile
 gaim_plugin/Makefile
 pidgin_plugin/Makefile

Modified: trunk/src/plugins/evolution/evolution.c
==============================================================================
--- trunk/src/plugins/evolution/evolution.c	(original)
+++ trunk/src/plugins/evolution/evolution.c	Mon Feb  9 11:10:09 2009
@@ -30,41 +30,84 @@
 
 #define GCONF_COMPLETION "/apps/evolution/addressbook"
 #define GCONF_COMPLETION_SOURCES GCONF_COMPLETION "/sources"
+#define DEFAULT_MAILTO "/desktop/gnome/url-handlers/mailto/command"
 
 #define CONTACT_FORMAT "%s <%s>"
 
-static char *evo_cmd = NULL;
+typedef enum {
+	MAILER_UNKNOWN,
+	MAILER_EVO,
+	MAILER_BALSA,
+	MAILER_SYLPHEED,
+	MAILER_THUNDERBIRD,
+} MailerType;
+
+static char *mail_cmd = NULL;
+static MailerType type = MAILER_UNKNOWN;
 static char *email = NULL;
 static char *name = NULL;
 
-static 
-gboolean init (NstPlugin *plugin)
+static char *
+get_evo_cmd (void)
 {
-	gchar *tmp = NULL;
-	gchar *cmds[] = {"evolution",
-			 "evolution-2.0",
-			 "evolution-2.2",
-			 "evolution-2.4",
-			 "evolution-2.6",
-			 "evolution-2.8", /* for the future */
-			 "evolution-3.0", /* but how far to go ? */
-			 NULL};
+	char *tmp = NULL;
+	char *retval;
+	char *cmds[] = {"evolution",
+		"evolution-2.0",
+		"evolution-2.2",
+		"evolution-2.4",
+		"evolution-2.6",
+		"evolution-2.8", /* for the future */
+		"evolution-3.0", /* but how far to go ? */
+		NULL};
 	guint i;
 
-	g_print ("Init evolution plugin\n");
-	
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        textdomain (GETTEXT_PACKAGE);
 	
 	for (i = 0; cmds[i] != NULL; i++) {
 		tmp = g_find_program_in_path (cmds[i]);
 		if (tmp != NULL)
 			break;
 	}
+
 	if (tmp == NULL)
+		return NULL;
+
+	retval = g_strdup_printf ("%s --component=mail %%s", tmp);
+	g_free (tmp);
+	return retval;
+}
+
+static gboolean
+init (NstPlugin *plugin)
+{
+	GConfClient *client;
+
+	g_print ("Init evolution plugin\n");
+	
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        textdomain (GETTEXT_PACKAGE);
+
+	client = gconf_client_get_default ();
+	mail_cmd = gconf_client_get_string (client, DEFAULT_MAILTO, NULL);
+	g_object_unref (client);
+
+	if (mail_cmd == NULL || *mail_cmd == '\0') {
+		g_free (mail_cmd);
+		mail_cmd = get_evo_cmd ();
+		type = MAILER_EVO;
+	} else {
+		/* Find what the default mailer is */
+		if (strstr (mail_cmd, "balsa"))
+			type = MAILER_BALSA;
+		else if (strstr (mail_cmd, "thunder"))
+			type = MAILER_THUNDERBIRD;
+		else if (strstr (mail_cmd, "sylpheed"))
+			type = MAILER_SYLPHEED;
+	}
+
+	if (mail_cmd == NULL)
 		return FALSE;
-	evo_cmd = tmp;
 
 	return TRUE;
 }
@@ -167,22 +210,18 @@
 	return entry;
 }
 
-static
-gboolean send_files (NstPlugin *plugin, GtkWidget *contact_widget,
-			GList *file_list)
+static void
+get_evo_mailto (GtkWidget *contact_widget, GString *mailto, GList *file_list)
 {
-	gchar *cmd;
-	GString *mailto;
 	GList *l;
 
-	mailto = g_string_new ("mailto:";);
-
+	g_string_append (mailto, "mailto:";);
 	if (email != NULL) {
 		if (name != NULL)
 			g_string_append_printf (mailto, "\""CONTACT_FORMAT"\"", name, email);
 		else
 			g_string_append_printf (mailto, "%s", email);
-	}else{
+	} else {
 		const char *text;
 
 		text = gtk_entry_get_text (GTK_ENTRY (contact_widget));
@@ -195,18 +234,125 @@
 	for (l = file_list->next ; l; l=l->next){
 		g_string_append_printf (mailto,"&attach=\"%s\"", (char *)l->data);
 	}
-	cmd = g_strdup_printf ("%s %s", evo_cmd, mailto->str);
+}
+
+static void
+get_balsa_mailto (GtkWidget *contact_widget, GString *mailto, GList *file_list)
+{
+	GList *l;
+
+	g_string_append (mailto, "--compose=");
+	if (email != NULL) {
+		if (name != NULL)
+			g_string_append_printf (mailto, "\""CONTACT_FORMAT"\"", name, email);
+		else
+			g_string_append_printf (mailto, "%s", email);
+	} else {
+		const char *text;
+
+		text = gtk_entry_get_text (GTK_ENTRY (contact_widget));
+		if (text != NULL && *text != '\0')
+			g_string_append_printf (mailto, "\"%s\"", text);
+		else
+			g_string_append (mailto, "\"\"");
+	}
+	g_string_append_printf (mailto," attach=\"%s\"", (char *)file_list->data);
+	for (l = file_list->next ; l; l=l->next){
+		g_string_append_printf (mailto," attach=\"%s\"", (char *)l->data);
+	}
+}
+
+static void
+get_thunderbird_mailto (GtkWidget *contact_widget, GString *mailto, GList *file_list)
+{
+	GList *l;
+
+	g_string_append (mailto, "-compose ");
+	if (email != NULL) {
+		if (name != NULL)
+			g_string_append_printf (mailto, "to=\""CONTACT_FORMAT"\",", name, email);
+		else
+			g_string_append_printf (mailto, "to=%s,", email);
+	} else {
+		const char *text;
+
+		text = gtk_entry_get_text (GTK_ENTRY (contact_widget));
+		if (text != NULL && *text != '\0')
+			g_string_append_printf (mailto, "to=\"%s\",", text);
+	}
+	g_string_append_printf (mailto,"attachment='%s", (char *)file_list->data);
+	for (l = file_list->next ; l; l=l->next){
+		g_string_append_printf (mailto,",%s", (char *)l->data);
+	}
+	g_string_append_c (mailto, '\'');
+}
+
+static void
+get_sylpheed_mailto (GtkWidget *contact_widget, GString *mailto, GList *file_list)
+{
+	GList *l;
+
+	g_string_append (mailto, "--compose ");
+	if (email != NULL) {
+		if (name != NULL)
+			g_string_append_printf (mailto, "\""CONTACT_FORMAT"\",", name, email);
+		else
+			g_string_append_printf (mailto, "%s,", email);
+	} else {
+		const char *text;
+
+		text = gtk_entry_get_text (GTK_ENTRY (contact_widget));
+		if (text != NULL && *text != '\0')
+			g_string_append_printf (mailto, "\"%s\",", text);
+		else
+			g_string_append (mailto, " \"\"");
+	}
+	g_string_append_printf (mailto,"--attach \"%s\"", (char *)file_list->data);
+	for (l = file_list->next ; l; l=l->next){
+		g_string_append_printf (mailto," \"%s\"", (char *)l->data);
+	}
+}
+
+static gboolean
+send_files (NstPlugin *plugin,
+	    GtkWidget *contact_widget,
+	    GList *file_list)
+{
+	gchar *cmd;
+	GString *mailto;
+
+	mailto = g_string_new ("");
+	switch (type) {
+	case MAILER_BALSA:
+		get_balsa_mailto (contact_widget, mailto, file_list);
+		break;
+	case MAILER_SYLPHEED:
+		get_sylpheed_mailto (contact_widget, mailto, file_list);
+		break;
+	case MAILER_THUNDERBIRD:
+		get_thunderbird_mailto (contact_widget, mailto, file_list);
+		break;
+	case MAILER_EVO:
+	default:
+		get_evo_mailto (contact_widget, mailto, file_list);
+	}
+
+	cmd = g_strdup_printf (mail_cmd, mailto->str);
+	g_string_free (mailto, TRUE);
+
+	g_message ("Mailer type: %d", type);
+	g_message ("Command: %s", cmd);
+
 	g_spawn_command_line_async (cmd, NULL);
 	g_free (cmd);
-	g_string_free (mailto, TRUE);
-	g_free (evo_cmd);
+
 	return TRUE;
 }
 
 static 
 gboolean destroy (NstPlugin *plugin){
-	g_free (evo_cmd);
-	evo_cmd = NULL;
+	g_free (mail_cmd);
+	mail_cmd = NULL;
 	g_free (name);
 	name = NULL;
 	g_free (email);