diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-09-01 22:57:02 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-01 22:57:02 +0800 |
| commit | a8cff3a02a1aecdea2e4fecfa37dca809a176ec2 (patch) | |
| tree | 096fd82b35851668fae9e032927502c19b10b6fa /mail | |
| parent | 65edf39de973207ca62acbcc7887eb2dce614537 (diff) | |
| download | gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.gz gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.bz2 gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.lz gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.xz gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.zst gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.zip | |
Fix compiler warnings in some of the test programs.
2008-09-01 Matthew Barnes <mbarnes@redhat.com>
* configure.in:
Fix compiler warnings in some of the test programs.
* mail/em-composer-utils.c (edit_message):
* plugins/email-custom-header/email-custom-header.c:
* plugins/templates/templates.c:
Don't mix declarations and code.
svn path=/trunk/; revision=36242
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 9673688f5c..ac6c5e9926 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2008-09-01 Matthew Barnes <mbarnes@redhat.com> + + * em-composer-utils.c (edit_message): + Don't mix declarations and code. + 2008-09-01 Milan Crha <mcrha@redhat.com> ** Fix for bug #543135 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 ); |