LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge to 2.0.7

maint-2.1.1 SOGo-2.0.7
Francis Lachapelle 2013-07-23 10:02:39 -04:00
parent c9936d7ecf bd776152db
commit c4bc215a47
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
commit 734c164ae02df4e2313003d143486eff67f42c5e
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Jul 23 09:25:24 2013 -0400
Reverted broken patch in #2360 and tried to fix it cleanly
M UI/MailPartViewers/GNUmakefile
M UI/MailerUI/GNUmakefile
commit 9f381e768dfd6548da4a88de370818ba6abb3314
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Jul 23 08:38:09 2013 -0400
Update ChangeLog
M ChangeLog
commit b531b6160c5ecc41f7160195da1b449dc87d01e3
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Jul 23 08:31:38 2013 -0400

22
UI/MailPartViewers/GNUmakefile
View File

@ -25,25 +25,7 @@ MailPartViewers_OBJC_FILES += \
UIxMailPartMessageViewer.m \
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
UIxMailPartICalActions.m
MailPartViewers_RESOURCE_FILES += \
product.plist \
@ -54,7 +36,7 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \
# make
ADDITIONAL_INCLUDE_DIRS += $(shell xml2-config --cflags)
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../../SoObjects/Mailer/obj -L../../SoObjects/Appointments/obj
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

9
UI/MailerUI/GNUmakefile
View File

@ -32,12 +32,7 @@ MailerUI_OBJC_FILES += \
UIxMailWindowCloser.m \
\
UIxMailUserRightsEditor.m \
../MailPartViewers/UIxMailRenderingContext.m \
UIxMailUserDelegationEditor.m \
# UIxMailEditorAction.m \
# UIxMailReplyAction.m \
# UIxMailForwardAction.m \
# UIxFilterList.m \
UIxMailUserDelegationEditor.m
MailerUI_RESOURCE_FILES += \
product.plist \
@ -49,7 +44,7 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \
# make
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../MailPartViewers/obj/
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make