Attachment 133881 Details for Bug 197868 – Proposed patch for #2 of Ray's 3-easy-steps

[patch] Proposed patch for #2 of Ray's 3-easy-steps

evolution-2.7.91-fix-mailto-command.patch (text/plain), 1.68 KB, created by Matthew Barnes on 2006-08-09 20:12:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Barnes

Created: 2006-08-09 20:12:20 UTC

Size: 1.68 KB

patch

obsolete

>--- evolution-2.7.91/plugins/default-mailer/default-mailer.c.invoke-with-component	2006-08-09 14:18:19.000000000 -0400
>+++ evolution-2.7.91/plugins/default-mailer/default-mailer.c	2006-08-09 14:38:24.000000000 -0400
>@@ -31,9 +31,18 @@
> #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)
>+{
>+        return (mailto_command != NULL) && (
>+                g_str_has_prefix (mailto_command, "evolution") ||
>+                g_str_has_prefix (mailto_command, "@evolution"));
>+}
>+
> void
> org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target)
> {
>@@ -54,11 +63,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