X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2FMakefile.am;h=88f60106998125f68870d10f19f5729a85388c4e;hp=0df374394d67ba3ad67bf4a876d08352f8b7f4cd;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=48d90b657563c7533c8c7b6e4b97db3a2200f566

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 0df3743..88f6010 100644
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -42,7 +42,6 @@ INCLUDES=\
 	-I ${top_srcdir}/src                \
 	-DPREFIX=\"@prefix@\" 	            \
 	-DMAEMO_CHANGES                     \
-	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
 	-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
 	-Wall
 
@@ -51,6 +50,8 @@ noinst_LTLIBRARIES=\
 
 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 \
@@ -59,6 +60,8 @@ libmodest_ui_la_SOURCES=              \
 	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 \
@@ -76,6 +79,8 @@ libmodest_ui_la_SOURCES=              \
 	modest-msg-view-window.c      \
 	modest-msg-edit-window.c      \
 	modest-maemo-utils.c          \
+	modest-number-editor.c        \
+	modest-number-editor.h        \
 	modest-connection-specific-smtp-window.h \
 	modest-connection-specific-smtp-window.c \
 	modest-connection-specific-smtp-edit-window.h \
@@ -111,14 +116,6 @@ libmodest_ui_la_LIBADD = \
 	$(MODEST_LIBALARM_LIBS)   \
 	$(MODEST_HILDON_NOTIFY_LIBS)
 
-PIXMAP_FILES=\
-	pixmaps/*.png 
-
-pixmapdir = $(datadir)/pixmaps/modest
-pixmap_DATA = $(PIXMAP_FILES)
-
-
-
 UI_FILES=\
 	ui/modest-main-window-ui.xml \
 	ui/modest-msg-edit-window-ui.xml \
@@ -131,8 +128,6 @@ serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 
-icon_26x26_DATA     = pixmaps/modest-icon.png
-
 # mcc_mapping may be provided by the operator-wizard-settings package:
 # the one here is a copy, as that package is not available in chinook
 MMC_MAPPING_FILE=mcc_mapping
@@ -149,6 +144,5 @@ EXTRA_DIST=\
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
 	$(backupsettings_DATA) \
-	$(icon_26x26_DATA)     \
 	$(MMC_MAPPING_FILE)    \
 	$(PROVIDER_DATA_FILE)