Applied patch from bug #2360

UI/MailPartViewers/GNUmakefile

@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
 	UIxMailPartICalViewer.m		\
 	\
 	UIxMailPartICalActions.m	\
+	../../SoObjects/Mailer/SOGoMailBodyPart.m \
+	../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
+	../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
+	../../SoObjects/Mailer/SOGoMailAccounts.m \
+	../../SoObjects/Mailer/SOGoMailBaseObject.m \
+	../../SoObjects/Mailer/SOGoMailAccount.m \
+	../../SoObjects/Mailer/SOGoMailNamespace.m \
+	../../SoObjects/Mailer/SOGoDraftsFolder.m \
+	../../SoObjects/Mailer/SOGoSentFolder.m \
+	../../SoObjects/Mailer/SOGoTrashFolder.m \
+	../../SoObjects/Mailer/SOGoMailFolder.m \
+	../../SoObjects/Mailer/SOGoDraftObject.m \
+	../../SoObjects/Mailer/SOGoMailObject.m \
+	../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
+	../../SoObjects/Appointments/SOGoAppointmentObject.m \
+	../../SoObjects/Appointments/SOGoComponentOccurence.m \
+	../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
+	../../SoObjects/Appointments/SOGoCalendarComponent.m
 
 MailPartViewers_RESOURCE_FILES += \
 	product.plist		\

UI/MailPartViewers/GNUmakefile.preamble

@@ -2,3 +2,10 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
 ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
 BUNDLE_LIBS += -lcrypto
 endif
+
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\""   \
+        -DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\""   \
+        -DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
+

UI/MailerUI/GNUmakefile

@@ -32,6 +32,7 @@ MailerUI_OBJC_FILES += \
 	UIxMailWindowCloser.m		\
 	\
 	UIxMailUserRightsEditor.m	\
+	../MailPartViewers/UIxMailRenderingContext.m \
 	UIxMailUserDelegationEditor.m	\
 #	UIxMailEditorAction.m		\
 #	UIxMailReplyAction.m		\