[anjal] Enable to compile against 2.26/2.28

[Srinivasa Ragavan <sragavan src gnome org>]

commit ab113750551a84d6b847127a1954dec5532092d0
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue May 5 13:16:36 2009 +0530

    Enable to compile against 2.26/2.28
---
 src/em-format-webkit-display.c |    8 ++++++++
 src/mail-folder-view.c         |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/em-format-webkit-display.c b/src/em-format-webkit-display.c
index ac0a56b..4e46415 100644
--- a/src/em-format-webkit-display.c
+++ b/src/em-format-webkit-display.c
@@ -72,7 +72,11 @@
 #include "mail/mail-config.h"
 #include "mail/mail-mt.h"
 #include "em-format-webkit-display.h"
+#ifdef EVOLUTION_2_26
 #include "mail/em-marshal.h"
+#else
+#include <e-util/e-marshal.h>
+#endif
 //#include "mail/e-searching-tokenizer.h"
 #include "mail/em-icon-stream.h"
 #include "mail/em-utils.h"
@@ -342,7 +346,11 @@ efwd_class_init(GObjectClass *klass)
 			     G_SIGNAL_RUN_LAST,
 			     G_STRUCT_OFFSET(EMFormatWebKitDisplayClass, popup_event),
 			     efwd_bool_accumulator, NULL,
+#ifdef EVOLUTION_2_26			      			     
 			     em_marshal_BOOLEAN__BOXED_POINTER_POINTER,
+#else
+			     e_marshal_BOOLEAN__BOXED_POINTER_POINTER,
+#endif			     
 			     G_TYPE_BOOLEAN, 3,
 			     GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
 			     G_TYPE_POINTER, G_TYPE_POINTER);
diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
index 44c3844..ac82d89 100644
--- a/src/mail-folder-view.c
+++ b/src/mail-folder-view.c
@@ -30,7 +30,11 @@
 #include "mail/em-popup.h"
 #include "mail/mail-mt.h"
 #include "mail/mail-ops.h"
+#ifdef EVOLUTION_2_26
 #include "mail/em-marshal.h"
+#else
+#include <e-util/e-marshal.h>
+#endif
 #include "misc/e-spinner.h"
 #include "mail-sqlite-store.h"
 #include "em-tree-store.h"
@@ -451,7 +455,11 @@ mail_folder_view_class_init (MailFolderViewClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (MailFolderViewClass , message_new),
 			      NULL, NULL,
+#ifdef EVOLUTION_2_26			      
 			      em_marshal_VOID__POINTER_POINTER,
+#else
+			      e_marshal_VOID__POINTER_POINTER,
+#endif			      
 			      G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	mail_folder_view_parent_class = g_type_class_peek_parent (klass);