[tomboy] fixed GMime usage to support 2.2 and 2.4
- From: Jeffrey Stedfast <fejj src gnome org>
- To: svn-commits-list gnome org
- Subject: [tomboy] fixed GMime usage to support 2.2 and 2.4
- Date: Fri, 1 May 2009 19:02:20 -0400 (EDT)
commit 09c36d1dd6429d3968b7f78db0333577f44c177a
Author: Jeffrey Stedfast <fejj gnome org>
Date: Fri May 1 18:54:46 2009 -0400
fixed GMime usage to support 2.2 and 2.4
Fixes for bug #565336
Removed unnecessary message.Subject header processing from
EvolutionNoteAddin.cs which was probably used to make sure
that the subject was in UTF-8 when using GMime versions older
than 2.2.7 (altho it'd also open up a new can of worms...).
Changed configure.in to prefer GMime# 2.4.x but to gracefully
fall back to 2.2.x >= 2.2.7.
---
Tomboy/Addins/Evolution/EvolutionNoteAddin.cs | 8 +++-----
configure.in | 11 ++++++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs b/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
index ce6b117..5d18e5a 100644
--- a/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
+++ b/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
@@ -396,12 +396,10 @@ namespace Tomboy.Evolution
GMime.Message message = parser.ConstructMessage ();
if (message == null)
break;
-
- string subject = GMime.Utils.HeaderDecodePhrase (message.Subject);
- subject_list.Add (subject);
+
+ Logger.Log ("Evolution: Message Subject: {0}", message.Subject);
+ subject_list.Add (message.Subject);
message.Dispose ();
-
- Logger.Log ("Evolution: Message Subject: {0}", subject);
};
parser.Dispose ();
diff --git a/configure.in b/configure.in
index 8563e58..ab238ea 100644
--- a/configure.in
+++ b/configure.in
@@ -214,10 +214,15 @@ done
#
-# Evolution.dll needs Gmime#
+# Evolution.dll needs GMime#
#
-PKG_CHECK_MODULES(EVOLUTION, gmime-sharp, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
-if test "x$ENABLE_GNOME" = "xno" ; then
+if test "x$ENABLE_GNOME" != "xno"; then
+ if pkg-config --exists gmime-sharp-2.4; then
+ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.4, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ else
+ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp >= 2.2.7, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ fi
+else
ENABLE_EVOLUTION=no
fi
AC_ARG_ENABLE(evolution,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]