aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/prefer-plain
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-09-11 23:34:29 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-11 23:34:29 +0800
commitc0a255eb90769638d57ae4122932f75c46e4e531 (patch)
tree5213694107a246763c25c0a089553dd7c8708b32 /plugins/prefer-plain
parent4c8aa5982c0132716f473873d0e1d7601df14607 (diff)
downloadgsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.bz2
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.lz
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.xz
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst
gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'plugins/prefer-plain')
-rw-r--r--plugins/prefer-plain/ChangeLog13
-rw-r--r--plugins/prefer-plain/prefer-plain.c31
2 files changed, 37 insertions, 7 deletions
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index 7f2699a779..9fbb00082b 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-09 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #551492
+
+ * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
+ Initialize variable before using it.
+
+2008-09-02 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * prefer-plain.c:
+
2008-08-12 Bharath Acharya <abharath@novell.com>
* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index ba70c4288f..45cafa562a 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -1,7 +1,24 @@
-
-/* Copyright (C) 2004 Michael Zucchi */
-
-/* This file is licensed under the GNU GPL v2 or later */
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Michael Zucchi <notzed@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -93,6 +110,9 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
CamelMimePart *part, *display_part = NULL;
int i, nparts, partidlen, displayid = 0;
+ /* FIXME: this part-id stuff is poking private data, needs api */
+ partidlen = t->format->part_id->len;
+
if (epp_mode == EPP_NORMAL) {
gboolean have_plain = FALSE;
@@ -151,9 +171,6 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
}
}
- /* this part-id stuff is poking private data, needs api */
- partidlen = t->format->part_id->len;
-
/* if we found a text part, show it */
if (display_part) {
g_string_append_printf(t->format->part_id, ".alternative.%d", displayid);