[evolution/account-mgmt: 2/33] Disable some top-level directories.

[Matthew Barnes <mbarnes src gnome org>]

commit 31c899dae4e22e03d2ef02b7ffb1901a7e8fd9d6
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Dec 19 09:01:57 2010 -0500

    Disable some top-level directories.
    
    Not ready to deal with capplet or plugins yet.

 Makefile.am                                       |    6 ++++--
 modules/Makefile.am                               |    4 +++-
 modules/mail/Makefile.am                          |    4 +++-
 modules/mail/em-account-prefs.c                   |    2 ++
 modules/startup-wizard/Makefile.am                |    4 +++-
 modules/startup-wizard/evolution-startup-wizard.c |    4 ++++
 6 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e10e7e4..a521d40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,10 @@ if GLADE_CATALOG
 MAINT_SUBDIR=maint
 endif
 
+# ACCOUNT_MGMT: Disable SUBDIRS
+# capplet (comes after calendar)
+# plugins (comes after art)
+
 SUBDIRS = 			\
 	m4			\
 	data			\
@@ -64,9 +68,7 @@ SUBDIRS = 			\
 	composer		\
 	mail			\
 	calendar		\
-	capplet			\
 	art			\
-	plugins			\
 	modules			\
 	$(MAINT_SUBDIR)		\
 	doc			\
diff --git a/modules/Makefile.am b/modules/Makefile.am
index ae95614..5c95034 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -18,9 +18,11 @@ if ENABLE_WINDOWS_SENS
 WINDOWS_SENS_DIR = windows-sens
 endif
 
+# ACCOUNT_MGMT: Disable SUBDIRS
+# calendar (comes after addressbook)
+
 SUBDIRS = \
 	addressbook \
-	calendar \
 	mail \
 	composer-autosave \
 	mailto-handler \
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 884d050..5197fab 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -52,6 +52,9 @@ libevolution_module_mail_la_SOURCES =					\
 	em-network-prefs.c						\
 	em-network-prefs.h
 
+# ACCOUNT_MGMT: Disabled:
+# $(top_builddir)/capplet/settings/libevolution-mail-settings.la
+
 libevolution_module_mail_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/em-format/libemformat.la			\
@@ -67,7 +70,6 @@ libevolution_module_mail_la_LIBADD =					\
 	$(top_builddir)/em-format/libemformat.la			\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/capplet/settings/libevolution-mail-settings.la	\
 	$(EVOLUTION_MAIL_LIBS)						\
 	$(CAMEL_LIBS)							\
 	$(GTKHTML_LIBS)							\
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index e309d2c..95ff565 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -221,8 +221,10 @@ account_prefs_add_account (EAccountManager *manager)
 		g_object_set_data_full (
 			G_OBJECT (priv->assistant), "AccountEditor",
 			emae, (GDestroyNotify) g_object_unref);
+#if 0  /* ACCOUNT_MGMT */
 	} else {
 		priv->assistant = mail_capplet_shell_new (0, TRUE, FALSE);
+#endif /* ACCOUNT_MGMT */
 	}
 
 	g_object_add_weak_pointer (G_OBJECT (priv->assistant), &priv->assistant);
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 90ee736..0e41a75 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -12,6 +12,9 @@ libevolution_module_startup_wizard_la_CPPFLAGS =		\
 libevolution_module_startup_wizard_la_SOURCES =			\
 	evolution-startup-wizard.c
 
+# ACCOUNT_MGMT: Disable:
+# $(top_builddir)/capplet/settings/libevolution-mail-settings.la
+
 libevolution_module_startup_wizard_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
@@ -19,7 +22,6 @@ libevolution_module_startup_wizard_la_LIBADD =			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(top_builddir)/capplet/settings/libevolution-mail-settings.la \
 	$(GNOME_PLATFORM_LIBS)					\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(EVOLUTION_MAIL_LIBS)
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 8f1b118..9d0e5b8 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -508,6 +508,7 @@ startup_wizard_new_assistant (EStartupWizard *extension)
 	return config->window;
 }
 
+#if 0  /* ACCOUNT_MGMT */
 static GtkWidget *
 startup_wizard_new_capplet (EStartupWizard *extension)
 {
@@ -521,6 +522,7 @@ startup_wizard_new_capplet (EStartupWizard *extension)
 
 	return capplet;
 }
+#endif /* ACCOUNT_MGMT */
 
 static void
 startup_wizard_run (EStartupWizard *extension)
@@ -542,9 +544,11 @@ startup_wizard_run (EStartupWizard *extension)
 	if (express_mode && g_strcmp0 (startup_view, "mail") != 0)
 		return;
 
+#if 0  /* ACCOUNT_MGMT */
 	if (express_mode)
 		window = startup_wizard_new_capplet (extension);
 	else
+#endif /* ACCOUNT_MGMT */
 		window = startup_wizard_new_assistant (extension);
 
 	g_signal_connect (