Cocoa fixes

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@766 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index d53348ff750e9289b827bfe7f50096489ae619c2..83c0dea58945b894d098c13ccfab9bb4cad2e884 100644 (file)
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
+       * SOGoAppointmentFolder.m: fixed Cocoa warnings (v0.9.46)
+
        * SOGoAppointmentFolder.m: fixed gcc 4.0 warnings (v0.9.45)
 
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index f01598a30d1e028a23421b498ed5d9ed725f8b6e..154d9d963a59a7f2e6d5597f0a3a2771b0e77e77 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -694,7 +694,7 @@ static NSTimeZone *MET    = nil;
   WOResponse *r;
   NSString *uri;
 
-  uri = [[_ctx request] uri];
+  uri = [[(WOContext *)_ctx request] uri];
   if (![uri hasSuffix:@"/"]) uri = [uri stringByAppendingString:@"/"];
   uri = [uri stringByAppendingString:@"weekoverview"];
 

diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version
index 213f7688ba5fbd23dbb2ef5d13d9a7eed8b27cf5..55414ff4ea913b2a8ae2eda2d168e9df366074e3 100644 (file)
--- a/SOGo/SoObjects/Appointments/Version
+++ b/SOGo/SoObjects/Appointments/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=45
+SUBMINOR_VERSION:=46
 
 # v0.9.42 requires libSOGo            v0.9.54
 # v0.9.32 requires libGDLContentStore v4.5.26

diff --git a/SOGo/SoObjects/ChangeLog b/SOGo/SoObjects/ChangeLog
index f28a8dd9bc8b3534e338f7ac56e15a1c7d64670c..b1cece134fdf3720275bd03cf02c711647d9c7c2 100644 (file)
--- a/SOGo/SoObjects/ChangeLog
+++ b/SOGo/SoObjects/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * common.make: fixed for OSX compilation
+
 2005-07-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * common.make: provide default install dir and bundle extension to

diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make
index e3d4b3aec0e127df137822c603e40bc4e441e6de..2c0f2b8124c1415c17b395e0abe2afe043ab7c97 100644 (file)
--- a/SOGo/SoObjects/common.make
+++ b/SOGo/SoObjects/common.make
@@ -28,3 +28,5 @@ BUNDLE_LIBS += \
        -lNGiCal -lNGMime -lNGLdap              \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lXmlRpc -lDOM -lSaxObjC
+
+ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)