Attachment 133995 Details for Bug 197868 – More sophisticated patch for #2.

[patch] More sophisticated patch for #2.

evolution-2.7.91-fix-mailto-command.patch (text/plain), 2.21 KB, created by Matthew Barnes on 2006-08-10 21:32:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Barnes

Created: 2006-08-10 21:32:06 UTC

Size: 2.21 KB

patch

obsolete

>--- evolution-2.7.91/plugins/default-mailer/default-mailer.c.fix-mailto-command	2006-02-27 04:22:15.000000000 -0500
>+++ evolution-2.7.91/plugins/default-mailer/default-mailer.c	2006-08-10 17:33:16.000000000 -0400
>@@ -31,9 +31,40 @@
> #define GCONF_KEY_CHECKDEFAULT   "/apps/evolution/mail/prompts/checkdefault"
> #define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled"
> #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command"
>+#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
> 
> void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
> 
>+static gboolean
>+evolution_is_default_mailer (const gchar *mailto_command)
>+{
>+        gint argc;
>+        gchar **argv;
>+        gchar *basename;
>+        gboolean is_default;
>+
>+        if (mailto_command == NULL)
>+                return FALSE;
>+
>+        g_debug ("mailto URL command: %s", mailto_command);
>+
>+        /* tokenize the mailto command */
>+        if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
>+                return FALSE;
>+
>+        g_assert (argc > 0);
>+
>+        /* check the basename of the first token */
>+        basename = g_path_get_basename (argv[0]);
>+        g_debug ("mailto URL program: %s", basename);
>+        is_default = g_str_has_prefix (basename, "evolution");
>+        g_free (basename);
>+
>+        g_strfreev (argv);
>+
>+        return is_default;
>+}
>+
> void
> org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target)
> {
>@@ -54,11 +85,11 @@
> 		mailer  = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL);
> 
> 		/* Check whether we are the default mailer */
>-		if(mailer == NULL || (strcmp(mailer, "@evolution %s") != 0 && strcmp(mailer, "evolution %s") != 0)) { 
>+		if (!evolution_is_default_mailer (mailer)) {
> 			/* Ask whether we should be the default mailer */
> 			if(em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) {
> 				gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL);
>-				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, "evolution %s", NULL);
>+				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL);
> 			}
> 		}
>

Actions: View | Diff

Attachments on bug 197868: 133881 | 133985 | 133986 | 133995