evolution r37501 - in branches/kill-bonobo: . addressbook/gui/contact-editor calendar/gui

[mcrha svn gnome org]

Author: mcrha
Date: Tue Apr  7 16:40:55 2009
New Revision: 37501
URL: http://svn.gnome.org/viewvc/evolution?rev=37501&view=rev

Log:
build a bit more smoothly


Modified:
   branches/kill-bonobo/Makefile.am
   branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
   branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
   branches/kill-bonobo/configure.in

Modified: branches/kill-bonobo/Makefile.am
==============================================================================
--- branches/kill-bonobo/Makefile.am	(original)
+++ branches/kill-bonobo/Makefile.am	Tue Apr  7 16:40:55 2009
@@ -68,8 +68,8 @@
 	$(SMIME_DIR)		\
 	composer		\
 	addressbook		\
-	calendar		\
 	mail			\
+	calendar		\
 	art			\
 	plugins			\
 	doc			\

Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c	(original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c	Tue Apr  7 16:40:55 2009
@@ -33,7 +33,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libedataserverui/e-categories-dialog.h>
-#include <misc/e-gui-utils.h>
+#include "misc/e-gui-utils.h"
 
 #include <libebook/e-address-western.h>
 #include <libedataserverui/e-category-completion.h>
@@ -45,7 +45,6 @@
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-util.h"
-#include "e-util/e-gui-utils.h"
 #include "e-util/e-error.h"
 #include "misc/e-dateedit.h"
 #include "misc/e-image-chooser.h"

Modified: branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c	(original)
+++ branches/kill-bonobo/calendar/gui/e-meeting-time-sel.c	Tue Apr  7 16:40:55 2009
@@ -36,13 +36,13 @@
 #include <glib/gi18n.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
 
-#include <misc/e-canvas.h>
-#include <misc/e-canvas-utils.h>
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
 
-#include <misc/e-dateedit.h>
-#include <e-util/e-gui-utils.h>
-#include <e-util/e-cursor.h>
-#include <e-util/e-util.h>
+#include "misc/e-dateedit.h"
+#include "misc/e-gui-utils.h"
+#include "e-util/e-cursor.h"
+#include "e-util/e-util.h"
 
 #include "calendar-config.h"
 #include "e-meeting-utils.h"

Modified: branches/kill-bonobo/configure.in
==============================================================================
--- branches/kill-bonobo/configure.in	(original)
+++ branches/kill-bonobo/configure.in	Tue Apr  7 16:40:55 2009
@@ -1790,7 +1790,7 @@
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
 dnl Temporary KILL-BONOBO hack
-enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http copy-tool default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mail-to-meeting mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread tnef-attachments vcard-inline webdav-account-setup"
+enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http copy-tool default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mail-to-meeting mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
 
 dnl PLUGINS NOT BUILDING YET
 dnl ------------------------