projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add live search support to mailboxes window
[modest]
/
src
/
hildon2
/
Makefile.am
diff --git
a/src/hildon2/Makefile.am
b/src/hildon2/Makefile.am
index
91cbb18
..
6e8f794
100644
(file)
--- a/
src/hildon2/Makefile.am
+++ b/
src/hildon2/Makefile.am
@@
-27,11
+27,11
@@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
INCLUDES=\
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
INCLUDES=\
- $(LIBMODEST_DBUS_CLIENT_CFLAGS) \
+ $(LIBMODEST_DBUS_CLIENT_CFLAGS) \
$(MODEST_GSTUFF_CFLAGS) \
$(MODEST_WPEDITOR_CFLAGS) \
$(MODEST_PLATFORM_CFLAGS) \
$(MODEST_GSTUFF_CFLAGS) \
$(MODEST_WPEDITOR_CFLAGS) \
$(MODEST_PLATFORM_CFLAGS) \
- $(MODEST_TOOLKIT_CFLAGS) \
+ $(MODEST_TOOLKIT_CFLAGS) \
$(MODEST_PLUGIN_DEFINES) \
$(MODEST_ABOOK_CFLAGS) \
$(MODEST_HILDON_HELP_CFLAGS) \
$(MODEST_PLUGIN_DEFINES) \
$(MODEST_ABOOK_CFLAGS) \
$(MODEST_HILDON_HELP_CFLAGS) \
@@
-39,10
+39,10
@@
INCLUDES=\
$(MODEST_HILDON_MIME_CFLAGS) \
$(MODEST_HILDON_NOTIFY_CFLAGS) \
$(MODEST_LIBALARM_CFLAGS) \
$(MODEST_HILDON_MIME_CFLAGS) \
$(MODEST_HILDON_NOTIFY_CFLAGS) \
$(MODEST_LIBALARM_CFLAGS) \
+ $(MODEST_CALENDAR_WIDGETS_CFLAGS) \
-I ${top_srcdir}/src/widgets \
-I ${top_srcdir}/src \
-DPREFIX=\"@prefix@\" \
-I ${top_srcdir}/src/widgets \
-I ${top_srcdir}/src \
-DPREFIX=\"@prefix@\" \
- -DMAEMO_CHANGES \
-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
-Wall
-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
-Wall
@@
-50,26
+50,18
@@
noinst_LTLIBRARIES=\
libmodest-ui.la
libmodest_ui_la_SOURCES= \
libmodest-ui.la
libmodest_ui_la_SOURCES= \
- modest-account-view-window.c \
- modest-accounts-window.c \
- modest-accounts-window.h \
- modest-default-account-settings-dialog.c \
- modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
modest-country-picker.h modest-country-picker.c \
modest-country-picker.h modest-country-picker.c \
+ modest-color-button.h modest-color-button.c \
modest-provider-picker.h modest-provider-picker.c \
modest-serversecurity-picker.h modest-serversecurity-picker.c \
modest-servertype-picker.h modest-servertype-picker.c \
modest-provider-picker.h modest-provider-picker.c \
modest-serversecurity-picker.h modest-serversecurity-picker.c \
modest-servertype-picker.h modest-servertype-picker.c \
- modest-folder-window.c \
- modest-folder-window.h \
- modest-header-window.c \
- modest-header-window.h \
modest-icon-names.h \
modest-hildon2-global-settings-dialog.c \
modest-hildon2-global-settings-dialog.h \
modest-icon-names.h \
modest-hildon2-global-settings-dialog.c \
modest-hildon2-global-settings-dialog.h \
- modest-wp-text-view.c \
- modest-wp-text-view.h \
modest-maemo-security-options-view.c \
modest-hildon-includes.h \
modest-maemo-security-options-view.c \
modest-hildon-includes.h \
+ modest-hildon-find-toolbar.h \
+ modest-hildon-find-toolbar.c \
modest-hildon-pannable-area-scrollable.h \
modest-hildon-pannable-area-scrollable.c \
modest-hildon2-details-dialog.h \
modest-hildon-pannable-area-scrollable.h \
modest-hildon-pannable-area-scrollable.c \
modest-hildon2-details-dialog.h \
@@
-78,20
+70,12
@@
libmodest_ui_la_SOURCES= \
modest-hildon2-sort-dialog.h \
modest-hildon2-window.h \
modest-hildon2-window.c \
modest-hildon2-sort-dialog.h \
modest-hildon2-window.h \
modest-hildon2-window.c \
- modest-mailboxes-window.c \
- modest-mailboxes-window.h \
modest-platform.c \
modest-platform.c \
- modest-signature-editor-dialog.c \
- modest-signature-editor-dialog.h \
modest-hildon2-msg-view-window.h \
modest-hildon2-msg-view-window.c \
modest-hildon2-msg-view-window.h \
modest-hildon2-msg-view-window.c \
- modest-msg-edit-window.c \
modest-maemo-utils.c \
modest-number-editor.c \
modest-number-editor.h \
modest-maemo-utils.c \
modest-number-editor.c \
modest-number-editor.h \
- modest-connection-specific-smtp-window.c \
- modest-connection-specific-smtp-edit-window.h \
- modest-connection-specific-smtp-edit-window.c \
modest-secureauth-picker.h modest-secureauth-picker.c \
modest-selector-picker.h modest-selector-picker.c \
modest-hildon2-window-mgr.h modest-hildon2-window-mgr.c
modest-secureauth-picker.h modest-secureauth-picker.c \
modest-selector-picker.h modest-selector-picker.c \
modest-hildon2-window-mgr.h modest-hildon2-window-mgr.c
@@
-115,15
+99,8
@@
libmodest_ui_la_LIBADD = \
$(MODEST_HILDON_HELP_LIBS) \
$(MODEST_LIBALARM_LIBS) \
$(MODEST_LIBIPHB_LIBS) \
$(MODEST_HILDON_HELP_LIBS) \
$(MODEST_LIBALARM_LIBS) \
$(MODEST_LIBIPHB_LIBS) \
- $(MODEST_HILDON_NOTIFY_LIBS)
-
-UI_FILES=\
- ui/modest-main-window-ui.xml \
- ui/modest-msg-edit-window-ui.xml \
- ui/modest-msg-view-window-ui.xml
-
-uidir = $(datadir)/modest/ui
-ui_DATA = $(UI_FILES)
+ $(MODEST_HILDON_NOTIFY_LIBS) \
+ $(MODEST_CALENDAR_WIDGETS_LIBS)
serviceentry_DATA = com.nokia.modest.service
desktopentry_DATA = modest.desktop
serviceentry_DATA = com.nokia.modest.service
desktopentry_DATA = modest.desktop
@@
-133,7
+110,6
@@
restore_SCRIPTS = modest-restore.sh
ossocudscripts_SCRIPTS = modest-clean.sh
EXTRA_DIST=\
ossocudscripts_SCRIPTS = modest-clean.sh
EXTRA_DIST=\
- $(UI_FILES) \
$(PIXMAP_FILES) \
$(serviceentry_DATA) \
$(desktopentry_DATA) \
$(PIXMAP_FILES) \
$(serviceentry_DATA) \
$(desktopentry_DATA) \