From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- mail/em-composer-utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mail/em-composer-utils.c') diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 8ae537ad7c..415a3d7193 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -822,6 +822,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelStream *stream; CamelMimePart *part; int count1 = 0, string_changed = 0; + const char *cur; + int i; char *str; gint count = 2; @@ -853,14 +855,14 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); - const char *cur = str; - int i; + cur = str; for (i = 0; i < strlen(str); i++) { if (!g_ascii_strncasecmp (cur, "$", 1)) { const char *end = cur, *check_env; char *out; GConfClient *gconf; GSList *clue_list = NULL, *list; + char **temp_str; gconf = gconf_client_get_default (); @@ -870,7 +872,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) out = g_strndup ((const gchar *) cur, end - cur); check_env = out; - char **temp_str = g_strsplit (str, out, 2); + temp_str = g_strsplit (str, out, 2); /* Get the list from gconf */ clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL ); -- cgit v1.2.3