[anjal] Make it compilable for various evo versions.



commit ce973db3dd60618c31757bc22ff8b179d85a1715
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri May 15 23:23:51 2009 +0530

    Make it compilable for various evo versions.
---
 src/Makefile.am      |    4 +++-
 src/mail-component.c |    6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 711113e..b759dc0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DEVOLUTION_PRIVDATADIR=\""$(datadir)/evolution/2.24/"\" \
+	-DEVOLUTION226_PRIVDATADIR=\""$(datadir)/evolution/2.26/"\" \
+	-DEVOLUTION228_PRIVDATADIR=\""$(datadir)/evolution/2.28/" \
 	-DANJAL_IMAGEDIR=\""$(datadir)/anjal/images/"\" \
 	$(ANJAL_CFLAGS)	-I. \
 	$(MOZILLA_CFLAGS) \
@@ -79,6 +80,7 @@ anjal_LDADD = $(ANJAL_LIBS) \
 	$(WEBKIT_LIBS) \
 	-lemiscwidgets \
 	-lfilter \
+	-lefilterbar \
 	-L$(evolutioncomponentdir) -levolution-mail-shared $(MOZ_ADD_LIBS)
 
 
diff --git a/src/mail-component.c b/src/mail-component.c
index 97cb686..16ed6b9 100644
--- a/src/mail-component.c
+++ b/src/mail-component.c
@@ -338,7 +338,11 @@ setup_search_context (MailComponent *component)
 
 	if (priv->search_context == NULL) {
 		char *user = g_build_filename(component->priv->base_directory, "searches.xml", NULL);
-		char *system = g_build_filename (EVOLUTION_PRIVDATADIR, "searchtypes.xml", NULL);
+#ifdef EVOLUTION_2_26		
+		char *system = g_build_filename (EVOLUTION226_PRIVDATADIR, "searchtypes.xml", NULL);
+#else
+		char *system = g_build_filename (EVOLUTION228_PRIVDATADIR, "searchtypes.xml", NULL);
+#endif		
 
 		priv->search_context = (RuleContext *)em_search_context_new ();
 		g_object_set_data_full (G_OBJECT (priv->search_context), "user", user, g_free);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]