Do only use effective mcc's for getting the providers and not when parsing the countr...

[modest] / src / widgets / Makefile.am

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index a4d31d1..acd181b 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
        $(MODEST_PLATFORM_CFLAGS) \
        $(MODEST_TOOLKIT_CFLAGS) \
+       $(MODEST_PLUGIN_DEFINES) \
        $(MODEST_HILDON_HELP_CFLAGS)    \
        $(MODEST_MOZEMBED_CFLAGS) \
        $(MODEST_HILDON_NOTIFY_CFLAGS) \
@@ -18,10 +19,6 @@ INCLUDES=\
 noinst_LTLIBRARIES=\
        libmodest-widgets.la
 
-to_remove=\
-       modest-testplugin-easysetup-wizard-page.h \
-       modest-testplugin-account-settings-dialog.h \
-       modest-testplugin-account-settings-widget.h
 
 libmodest_widgets_public_headers = \
        modest-account-settings-dialog.h \
@@ -30,7 +27,9 @@ libmodest_widgets_public_headers = \
        modest-sort-criterium-view.h  \
        modest-ui-constants.h \
        modest-validating-entry.h \
-       modest-window.h 
+       modest-window.h \
+       modest-window-mgr.h     \
+       modest-wizard-dialog.h
 
 
 libmodest_widgets_la_SOURCES=          \
@@ -45,15 +44,21 @@ libmodest_widgets_la_SOURCES=          \
        modest-attachments-view.h      \
        modest-combo-box.c             \
        modest-combo-box.h             \
+       modest-compact-mail-header-view.c \
+       modest-compact-mail-header-view.h \
        modest-default-account-settings-dialog.h \
        modest-dnd.c                   \
        modest-dnd.h                   \
        modest-easysetup-wizard-page.c \
+       modest-expander-mail-header-view.c      \
+       modest-expander-mail-header-view.h      \
        modest-folder-view.c           \
        modest-global-settings-dialog.c \
        modest-global-settings-dialog.h \
        modest-gtkhtml-mime-part-view.c \
        modest-gtkhtml-mime-part-view.h \
+       modest-hildon1-window-mgr.c \
+       modest-hildon1-window-mgr.h \
        modest-hbox-cell-renderer.c    \
        modest-hbox-cell-renderer.h    \
        modest-vbox-cell-renderer.c    \
@@ -67,8 +72,8 @@ libmodest_widgets_la_SOURCES=          \
        modest-isearch-view.h          \
        modest-limit-retrieve-combo-box.h \
        modest-limit-retrieve-combo-box.c \
-       modest-mail-header-view.c      \
-       modest-mail-header-view.h      \
+       modest-mail-header-view.h \
+       modest-mail-header-view.c \
        modest-main-window.h           \
        modest-mime-part-view.c        \
        modest-mime-part-view.h        \
@@ -106,6 +111,7 @@ libmodest_widgets_la_SOURCES=          \
        modest-tny-stream-gtkhtml.h    \
        modest-validating-entry.c \
        modest-window.c                \
+       modest-window-mgr-priv.h        \
        modest-window-mgr.h            \
        modest-window-mgr.c            \
        modest-wizard-dialog.h         \