--- mail-notification-2.0/src/mn-evolution-folder-tree-control.c.evolution	2005-09-14 16:17:50.000000000 +0200
+++ mail-notification-2.0/src/mn-evolution-folder-tree-control.c	2005-09-14 16:17:37.000000000 +0200
@@ -22,7 +22,7 @@
 #include <libbonoboui.h>
 
 /* headers from the Evolution source tree */
-#include "mail/mail-component.h"
+/*#include "mail/mail-component.h"*/
 #include "mail/em-folder-tree.h"
 
 #include "mn-evolution.h"
--- mail-notification-2.0/configure.evolution	2005-08-09 22:01:09.000000000 +0200
+++ mail-notification-2.0/configure	2005-09-14 16:15:51.000000000 +0200
@@ -24784,12 +24784,12 @@
   if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then
 	pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value
 elif test -n "$PKG_CONFIG"; then
-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+  ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
+		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -24807,12 +24807,12 @@
   if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then
 	pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value
 elif test -n "$PKG_CONFIG"; then
-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+  ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
+		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -24824,7 +24824,7 @@
 echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6
 
 if test $pkg_failed = yes; then
-	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"`
+	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.8 $evolution_plugin_min_version"`
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
 
@@ -24841,7 +24841,7 @@
 if test $found = yes; then
 	echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
-	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null`
+	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.8 2>/dev/null`
 	if test -n "$evolution_plugindir"; then
 		echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
 echo "${ECHO_T}$evolution_plugindir" >&6