From 25ca1ada5d9314eb6bbaf9f19f73df517e8d2f21 Mon Sep 17 00:00:00 2001 From: helge Date: Sat, 23 Jul 2005 15:55:10 +0000 Subject: [PATCH] fixed compilation in new hierarchy fixed some gcc 4.0 issues git-svn-id: http://svn.opengroupware.org/SOGo/trunk@910 d1b88da0-ebda-0310-925b-ed51d893ca5b --- Protocols/common.make | 3 ++- UI/GNUmakefile | 1 - UI/MailPartViewers/ChangeLog | 5 +++++ UI/MailPartViewers/UIxMailPartICalViewer.m | 6 +++--- UI/MailPartViewers/Version | 2 +- UI/MailerUI/ChangeLog | 4 ++++ UI/MailerUI/UIxMailFormatter.m | 6 +++--- UI/MailerUI/UIxMailToSelection.m | 6 +++--- UI/Scheduler/ChangeLog | 9 ++++++--- UI/Scheduler/UIxAppointmentPrintview.m | 2 +- UI/Scheduler/UIxCalDayListview.m | 2 +- UI/Scheduler/Version | 2 +- 12 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Protocols/common.make b/Protocols/common.make index 7bd55dcc..59752b3b 100644 --- a/Protocols/common.make +++ b/Protocols/common.make @@ -17,12 +17,13 @@ ADDITIONAL_INCLUDE_DIRS += \ RELBUILD_DIR_libSOGo = \ $(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME) RELBUILD_DIR_libOGoContentStore = \ - $(GNUSTEP_BUILD_DIR)/../../../SOGo/OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) + $(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) ADDITIONAL_LIB_DIRS += \ -L$(RELBUILD_DIR_libSOGo) \ -L$(RELBUILD_DIR_libOGoContentStore) +# todo: use SYSTEM_LIB_DIR? ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib BUNDLE_LIBS += \ diff --git a/UI/GNUmakefile b/UI/GNUmakefile index 52589a4a..002e73cb 100644 --- a/UI/GNUmakefile +++ b/UI/GNUmakefile @@ -10,7 +10,6 @@ SUBPROJECTS += \ Contacts \ MailerUI \ MailPartViewers \ - Anais \ SUBPROJECTS += \ Templates diff --git a/UI/MailPartViewers/ChangeLog b/UI/MailPartViewers/ChangeLog index d3fd2683..1486238a 100644 --- a/UI/MailPartViewers/ChangeLog +++ b/UI/MailPartViewers/ChangeLog @@ -1,3 +1,8 @@ +2005-07-23 Helge Hess + + * UIxMailPartICalViewer.m: fixed include path for new hierarchy + (v0.9.17) + 2005-07-18 Helge Hess * UIxMailRenderingContext.m: show text/plain and text/html attachments diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m index fd468cc0..80da457d 100644 --- a/UI/MailPartViewers/UIxMailPartICalViewer.m +++ b/UI/MailPartViewers/UIxMailPartICalViewer.m @@ -48,9 +48,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include "common.h" diff --git a/UI/MailPartViewers/Version b/UI/MailPartViewers/Version index 4c9aeea9..e0fa2a65 100644 --- a/UI/MailPartViewers/Version +++ b/UI/MailPartViewers/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=16 +SUBMINOR_VERSION:=17 # v0.9.0 requires libNGiCal v4.5.53 # v0.9.1 requires libNGMime v4.5.213 diff --git a/UI/MailerUI/ChangeLog b/UI/MailerUI/ChangeLog index 07804f53..bb47ed18 100644 --- a/UI/MailerUI/ChangeLog +++ b/UI/MailerUI/ChangeLog @@ -1,3 +1,7 @@ +2005-07-23 Helge Hess + + * UIxMailToSelection.m, UIxMailFormatter.m: fixed gcc 4.0 warnings + 2005-07-22 Helge Hess * v0.9.170 diff --git a/UI/MailerUI/UIxMailFormatter.m b/UI/MailerUI/UIxMailFormatter.m index 04a98790..e15f27b2 100644 --- a/UI/MailerUI/UIxMailFormatter.m +++ b/UI/MailerUI/UIxMailFormatter.m @@ -84,9 +84,9 @@ static BOOL debugOn = YES; /* formatting dates */ -- (NSString *)stringForTime:(NSCalendarDate *)_d prefix:(unsigned char *)_p { +- (NSString *)stringForTime:(NSCalendarDate *)_d prefix:(char *)_p { /* Note: prefix is not allowed to be long! */ - unsigned char buf[32]; + char buf[32]; if (_p == NULL) _p = ""; sprintf(buf, "%s%02i:%02i", _p, [_d hourOfDay], [_d minuteOfHour]); @@ -94,7 +94,7 @@ static BOOL debugOn = YES; } - (NSString *)stringForCalendarDate:(NSCalendarDate *)_date { - unsigned char buf[32]; + char buf[32]; if (self->now == nil) { self->now = [[NSCalendarDate alloc] init]; diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m index 9f4cc526..bd802443 100644 --- a/UI/MailerUI/UIxMailToSelection.m +++ b/UI/MailerUI/UIxMailToSelection.m @@ -179,19 +179,19 @@ static NSArray *headers = nil; /* identifiers */ - (NSString *)currentRowId { - unsigned char buf[16]; + char buf[16]; sprintf(buf, "row_%d", self->currentIndex); return [NSString stringWithCString:buf]; } - (NSString *)currentPopUpId { - unsigned char buf[16]; + char buf[16]; sprintf(buf, "popup_%d", self->currentIndex); return [NSString stringWithCString:buf]; } - (NSString *)currentAddressId { - unsigned char buf[16]; + char buf[16]; sprintf(buf, "addr_%d", self->currentIndex); return [NSString stringWithCString:buf]; } diff --git a/UI/Scheduler/ChangeLog b/UI/Scheduler/ChangeLog index a98882ab..77d57ed6 100644 --- a/UI/Scheduler/ChangeLog +++ b/UI/Scheduler/ChangeLog @@ -1,9 +1,12 @@ -2005-07-21 Marcus Mueller +2005-07-23 Helge Hess + + * UIxAppointmentPrintview.m, UIxCalDayListview.m: fixed include pathes + for new src hierarchy (v0.9.146) - * v0.9.145 +2005-07-21 Marcus Mueller * UIxAppointmentView.m: fixed -isMyApt and -canAccessApt to do the - proper things + proper things (v0.9.145) * v0.9.144 diff --git a/UI/Scheduler/UIxAppointmentPrintview.m b/UI/Scheduler/UIxAppointmentPrintview.m index 914674d4..88ebcad2 100644 --- a/UI/Scheduler/UIxAppointmentPrintview.m +++ b/UI/Scheduler/UIxAppointmentPrintview.m @@ -30,7 +30,7 @@ @end #include "common.h" -#include +#include #include #include "UIxComponent+Agenor.h" diff --git a/UI/Scheduler/UIxCalDayListview.m b/UI/Scheduler/UIxCalDayListview.m index d0abf930..cfe10042 100644 --- a/UI/Scheduler/UIxCalDayListview.m +++ b/UI/Scheduler/UIxCalDayListview.m @@ -40,7 +40,7 @@ #include "common.h" #include #include -#include +#include @implementation UIxCalDayListview diff --git a/UI/Scheduler/Version b/UI/Scheduler/Version index 47965445..6a20f8b8 100644 --- a/UI/Scheduler/Version +++ b/UI/Scheduler/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=145 +SUBMINOR_VERSION:=146 # v0.9.136 requires SOGoUI v0.9.30 # v0.9.123 requires Appointments v0.9.35 -- 2.39.5