GNOME.org
 

[evolution/email-factory-3-4] Push Mikhail's compilation patch.

commit 3fa1a39585eedf8ec44904d9bdf2be2938a1cd19
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Thu Jan 5 11:40:02 2012 +0530

    Push Mikhail's compilation patch.

 capplet/settings/Makefile.am             |    2 ++
 composer/Makefile.am                     |    1 +
 libemail-engine/e-mail-session.c         |    2 +-
 mail/importers/Makefile.am               |    2 ++
 modules/bogofilter/Makefile.am           |    2 ++
 modules/calendar/Makefile.am             |    1 +
 modules/online-accounts/Makefile.am      |    1 +
 modules/spamassassin/Makefile.am         |    2 ++
 modules/startup-wizard/Makefile.am       |    2 ++
 plugins/caldav/Makefile.am               |    1 +
 plugins/dbx-import/Makefile.am           |    2 ++
 plugins/itip-formatter/Makefile.am       |    2 ++
 plugins/mail-notification/Makefile.am    |    1 +
 plugins/mail-to-task/Makefile.am         |    1 +
 plugins/mailing-list-actions/Makefile.am |    2 ++
 plugins/templates/Makefile.am            |    1 +
 smime/lib/Makefile.am                    |    1 +
 widgets/misc/Makefile.am                 |    1 +
 widgets/table/Makefile.am                |    1 +
 widgets/text/Makefile.am                 |    1 +
 20 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index 1367fd5..db899e0 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -59,6 +59,8 @@ libevolution_mail_settings_la_LIBADD = 				\
 	$(top_builddir)/filter/libfilter.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/libemail-utils/libemail-utils.la \
+	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(top_builddir)/e-util/libeutil.la
 
 libevolution_mail_settings_la_LDFLAGS =  $(NO_UNDEFINED)
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 013d04c..cee00a0 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -63,6 +63,7 @@ libcomposer_la_LIBADD =					\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 10aedf2..6e4511e 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -182,7 +182,7 @@ user_message_exec (struct _user_message_msg *m,
                    GError **error)
 {
 	const gchar *error_type;
-
+	(void)error_type;
 	if (!m->ismain) {
 		g_queue_push_tail (&user_message_queue, mail_msg_ref (m));
 		return;
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index fa1a400..6a7e9a8 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -28,6 +28,8 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 5fbf45e..2d8f5c9 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -14,6 +14,8 @@ libevolution_module_bogofilter_la_SOURCES =			\
 libevolution_module_bogofilter_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 4f09f92..57b697b 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -89,6 +89,7 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/mail/libevolution-mail.la \
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la	\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/widgets/menus/libmenus.la			\
diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index ccb7ada..f449247 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -18,6 +18,7 @@ libevolution_module_online_accounts_la_SOURCES =		\
 libevolution_module_online_accounts_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GOA_LIBS)
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index 8ea9130..fce8989 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -14,6 +14,8 @@ libevolution_module_spamassassin_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 2643387..ebaec22 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -19,6 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD =			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la \
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index 6d89204..432cafd 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -19,6 +19,7 @@ liborg_gnome_evolution_caldav_la_SOURCES =		\
 liborg_gnome_evolution_caldav_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index 67d5e0d..eeaf69f 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -27,6 +27,8 @@ liborg_gnome_dbx_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 793908e..71fced6 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -22,6 +22,8 @@ liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/em-format/libemformat.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
+	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index bcac34a..07cb42e 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -29,6 +29,7 @@ liborg_gnome_mail_notification_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(LIBNOTIFY_LIBS)				\
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 845a82c..48f0724 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -23,6 +23,7 @@ liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la		\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(GTKHTML_LIBS)
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 77f6fdc..a3c46ef 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -21,6 +21,8 @@ liborg_gnome_mailing_list_actions_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index a64a10e..948dfea 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -23,6 +23,7 @@ liborg_gnome_templates_la_LIBADD =	\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index df2fb96..17a2a63 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -32,6 +32,7 @@ libessmime_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
+	$(top_builddir)/libemail-utils/libemail-utils.la	\
 	$(CERT_UI_LIBS)
 
 libessmime_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 71194d1..8fcbc70 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -161,6 +161,7 @@ libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)						\
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 36af5ec..001a2fd 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -172,6 +172,7 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index d7c62af..0928da0 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -35,6 +35,7 @@ libetext_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(REGEX_LIBS)						\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]