From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 15 Jul 2005 00:15:54 +0000 (+0000)
Subject: fixed gcc4 warnings
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe95ced496500116004e348c194a76c3e71898b3;p=scalable-opengroupware.org

fixed gcc4 warnings


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

diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog
index 43d3b0c1..9896637a 100644
--- a/SOGo/SoObjects/Contacts/ChangeLog
+++ b/SOGo/SoObjects/Contacts/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SOGoContactFolder.m: fixed a gcc 4.0 warning (v0.9.13)
+
 2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
 
 	* SOGoContactFolder.m: use +globallyUniqueObjectId method from
diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
index 23bb95d4..5792643c 100644
--- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m
+++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
@@ -98,7 +98,7 @@
 
 /* GET */
 
-- (id)GETAction:(WOContext *)_ctx {
+- (id)GETAction:(id)_ctx {
   // TODO: I guess this should really be done by SOPE (redirect to
   //       default method)
   WOResponse *r;
diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version
index a234750e..fd6a9b55 100644
--- a/SOGo/SoObjects/Contacts/Version
+++ b/SOGo/SoObjects/Contacts/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=12
+SUBMINOR_VERSION:=13
 
 # v0.9.12 requires libSOGo            v0.9.54
 # v0.9.9  requires libGDLContentStore v4.5.26
diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index d2f0236f..4dc22242 100644
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
+	* SOGoMailObject.m, SOGoMailBodyPart.m, SOGoDraftObject.m: fixed gcc4.0
+	  warnings (v0.9.104)
+
 	* SOGoMailManager.h: fixed a gcc 4.0 warning (v0.9.103)
 
 2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
diff --git a/SOGo/SoObjects/Mailer/SOGoDraftObject.m b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
index cee6d885..5256090b 100644
--- a/SOGo/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
@@ -829,7 +829,7 @@ static BOOL       debugOn = NO;
   return [NSNumber numberWithBool:YES]; /* delete worked out ... */
 }
 
-- (id)GETAction:(WOContext *)_ctx {
+- (id)GETAction:(id)_ctx {
   /* 
      Override, because SOGoObject's GETAction uses the less efficient
      -contentAsString method.
diff --git a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
index 1a01a706..286d5925 100644
--- a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -224,7 +224,7 @@ static BOOL debugOn = NO;
 
 /* actions */
 
-- (id)GETAction:(WOContext *)_ctx {
+- (id)GETAction:(id)_ctx {
   WOResponse *r;
   NSData     *data;
   
diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.m b/SOGo/SoObjects/Mailer/SOGoMailObject.m
index 443bd7ca..47832c8a 100644
--- a/SOGo/SoObjects/Mailer/SOGoMailObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailObject.m
@@ -422,7 +422,8 @@ static BOOL debugBodyStructure = NO;
     NSData   *data;
     
     key  = [_fetchKeys objectAtIndex:i];
-    data = [[result objectForKey:key] objectForKey:@"data"];
+    data = [(NSDictionary *)[(NSDictionary *)result objectForKey:key] 
+			    objectForKey:@"data"];
     
     if (![data isNotNull]) {
       [self debugWithFormat:@"got no data fork key: %@", key];
@@ -602,7 +603,7 @@ static BOOL debugBodyStructure = NO;
 
 /* actions */
 
-- (id)GETAction:(WOContext *)_ctx {
+- (id)GETAction:(id)_ctx {
   WOResponse *r;
   NSData     *content;
   
diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index 33dce1ed..f1a4f532 100644
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=103
+SUBMINOR_VERSION:=104
 
 # v0.9.96 requires libNGMime       v4.5.223
 # v0.9.91 requires libNGMime       v4.5.222