changes to use NGLogging in all places

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 0f416d6f78e187e9b03fedd7c3d31b2cc1536250..3df83e9f14d8a03c10c05279b8a9aea9539f12f6 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoProductLoader.m, sogod.m: changed to use NGLogging (v0.9.16)
+
 2004-10-19  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoUserHomePage.[wox|m]: changed hrefs to be computed dynamically

diff --git a/SOGo/Main/SOGoProductLoader.m b/SOGo/Main/SOGoProductLoader.m
index 7c0f487e040e8ebdb1ab60540b7520f2f8d8875a..abc6001c77c7556d69de7f16b54f0be452690c52 100644 (file)
--- a/SOGo/Main/SOGoProductLoader.m
+++ b/SOGo/Main/SOGoProductLoader.m
@@ -125,7 +125,7 @@
   }
   
   if (![registry loadAllProducts])
-    [self logWithFormat:@"WARNING: could not load all products !"];
+    [self warnWithFormat:@"could not load all products !"];
 }
 
 @end /* SOGoProductLoader */

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index cf9e5c1262bbe256db9dcbe38538f8ad07693b99..3b517c7b6a687e1d4009601936a63bf8bb178178 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=15
+SUBMINOR_VERSION:=16
+
+# v0.9.16 requires NGExtensions v4.5.136

diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m
index 03dc26e639dc1a8ffb6b508c82a752c3b53b4dd1..6758f0c61a85b6184beb5ec34d5a9aaaed93732a 100644 (file)
--- a/SOGo/Main/sogod.m
+++ b/SOGo/Main/sogod.m
@@ -204,7 +204,7 @@ static BOOL doCrashOnSessionCreate = NO;
 /* session management */
 
 - (WOSession *)createSessionForRequest:(WORequest *)_request {
-  [self logWithFormat:@"WARNING: session creation requested!"];
+  [self warnWithFormat:@"session creation requested!"];
   if (doCrashOnSessionCreate)
     abort();
   return [super createSessionForRequest:_request];

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 48e0ed94bb1feff03b814709c2b8931c7baed1f0..ab0116c2dbfddc36ff3f454707cf3fbac972aff4 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -1039,6 +1039,23 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD5DF18E072E5AC500173622 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailEditorAttach.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD5DF18F072E5AC500173622 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxMailEditorAttach.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                AD5ED0AF06B1385700E3EC4B = {
                        fileEncoding = 4;
                        isa = PBXFileReference;
@@ -1609,6 +1626,23 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               ADC07230072E9BFB00C125E0 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxMailMoveToPopUp.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADC07231072E9BFB00C125E0 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailMoveToPopUp.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                ADCDE53106ADA8AC00BFCE2B = {
                        fileEncoding = 5;
                        indentWidth = 8;
@@ -2502,6 +2536,8 @@
                                AD2C74BD071A9FF70087E027,
                                ADDF4DCA06DE0E9A00C4E7F8,
                                ADDF4DCB06DE0E9A00C4E7F8,
+                               AD5DF18E072E5AC500173622,
+                               AD5DF18F072E5AC500173622,
                                AD2C78F7071C23CE0087E027,
                                AD2C78F6071C23CE0087E027,
                                AD2C76D6071BF4EB0087E027,
@@ -2510,6 +2546,8 @@
                                ADDF4DCD06DE0E9A00C4E7F8,
                                ADBE446707297BA9000FEA6A,
                                ADBE446607297BA9000FEA6A,
+                               ADC07231072E9BFB00C125E0,
+                               ADC07230072E9BFB00C125E0,
                                ADDF4DCE06DE0E9A00C4E7F8,
                                ADDF4DCF06DE0E9A00C4E7F8,
                        );

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index 24b443728a94120fa19a3f12a4087e3b0f1da0d4..fa785701bf270dc741c86d29a487a6aec990eb8c 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -95,7 +95,7 @@ static NSTimeZone *MET = nil;
   if (aptClass == Nil)
     aptClass = NSClassFromString(@"SOGoAppointmentObject");
   if (aptClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoAppointmentObject class!"];
+    [self errorWithFormat:@"missing SOGoAppointmentObject class!"];
     return nil;
   }
   
@@ -182,8 +182,8 @@ static NSTimeZone *MET = nil;
   NSString    *sql;
   
   if (_folder == nil) {
-    [self logWithFormat:@"ERROR(%s): missing folder for fetch!",
-           __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): missing folder for fetch!",
+            __PRETTY_FUNCTION__];
     return nil;
   }
   
@@ -203,7 +203,7 @@ static NSTimeZone *MET = nil;
   
   records = [_folder fetchFields:fields matchingQualifier:qualifier];
   if (records == nil) {
-    [self logWithFormat:@"ERROR(%s): fetch failed!", __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): fetch failed!", __PRETTY_FUNCTION__];
     return nil;
   }
   
@@ -220,8 +220,8 @@ static NSTimeZone *MET = nil;
   OCSFolder *folder;
   
   if ((folder = [self ocsFolder]) == nil) {
-    [self logWithFormat:@"ERROR(%s): missing folder for fetch!",
-           __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): missing folder for fetch!",
+            __PRETTY_FUNCTION__];
     return nil;
   }
   return [self fetchCoreInfosFromFolder:folder from:_startDate to:_endDate];
@@ -257,7 +257,7 @@ static NSTimeZone *MET = nil;
   /* create subcontext, so that we don't destroy our environment */
   
   if ((ctx = [_ctx createSubContext]) == nil) {
-    [self logWithFormat:@"ERROR: could not create SOPE subcontext!"];
+    [self errorWithFormat:@"could not create SOPE subcontext!"];
     return nil;
   }
   
@@ -270,8 +270,8 @@ static NSTimeZone *MET = nil;
   result = [[ctx application] traversePathArray:path inContext:ctx
                              error:&error acquire:NO];
   if (error != nil) {
-    [self logWithFormat:@"ERROR: folder lookup failed (uid=%@): %@",
-           _uid, error];
+    [self errorWithFormat:@"folder lookup failed (uid=%@): %@",
+            _uid, error];
     return nil;
   }
   
@@ -411,8 +411,8 @@ static NSTimeZone *MET = nil;
     
     event = [[SOGoAppointment alloc] initWithICalString:content];
     if (![event isNotNull]) {
-      [self logWithFormat:@"ERROR(%s): could not parse an iCal file!",
-             __PRETTY_FUNCTION__];
+      [self errorWithFormat:@"(%s): could not parse an iCal file!",
+              __PRETTY_FUNCTION__];
       continue;
     }
 

diff --git a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
index e7ddbe12b37539a4652aac4730fdd244bc08084b..5df39046ecd9dbf644c17fa66bd31fc22d2d0a31 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -51,8 +51,8 @@
 - (SOGoAppointmentFolder *)folderForUID:(NSString *)_uid {
   if (self->uidToFolder == nil) {
     // TODO: can we trigger a fetch?
-    [self logWithFormat:
-           @"ERROR: called -folderForUID method before fetchCoreInfos .."];
+    [self errorWithFormat:
+            @"called -folderForUID method before fetchCoreInfos .."];
     return nil;
   }
   
@@ -103,7 +103,7 @@
     return nil;
   
   if (![aptFolder respondsToSelector:@selector(fetchCoreInfosFrom:to:)]) {
-    [self logWithFormat:@"ERROR: folder does not implemented required API: %@",
+    [self errorWithFormat:@"folder does not implemented required API: %@",
            _folder];
     return nil;
   }
@@ -163,9 +163,9 @@
       
       uid = [record objectForKey:@"uid"];
       if (![uid isNotNull]) {
-       [self logWithFormat:@"WARNING: record without uid: %@", result];
-       [result addObject:record];
-       continue;
+        [self warnWithFormat:@"record without uid: %@", result];
+        [result addObject:record];
+        continue;
       }
       
       if ((existingRecord = [uidToRecord objectForKey:uid]) == nil) {
@@ -202,7 +202,7 @@
   NSArray *folders;
   
   if ((folders = [[self container] valueForKey:@"memberFolders"]) == nil) {
-    [self logWithFormat:@"ERROR: calendar container has no 'memberFolders'?!"];
+    [self errorWithFormat:@"calendar container has no 'memberFolders'?!"];
     return nil;
   }
   
@@ -217,17 +217,17 @@
   SOGoAppointmentFolder *folder;
   
   if ([_uid length] == 0) {
-    [self logWithFormat:@"ERROR: got invalid UID."];
+    [self errorWithFormat:@"got invalid UID."];
     return nil;
   }
   
   if ((folder = [self folderForUID:_uid]) == nil) {
-    [self logWithFormat:@"ERROR: did not find a folder containing UID: '%@'",
+    [self errorWithFormat:@"did not find a folder containing UID: '%@'",
            _uid];
     return nil;
   }
   if (![folder respondsToSelector:_cmd]) {
-    [self logWithFormat:@"ERROR: found folder cannot construct UID URLs: %@",
+    [self errorWithFormat:@"found folder cannot construct UID URLs: %@",
            folder];
     return nil;
   }

diff --git a/SOGo/SoObjects/ChangeLog b/SOGo/SoObjects/ChangeLog
index e2145595d4e0f6508c87d5e0141807e095fef59c..4aabaaf4bc921b02a50ac09d88c77fdf8ffd0f4a 100644 (file)
--- a/SOGo/SoObjects/ChangeLog
+++ b/SOGo/SoObjects/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Appointments/SOGoGroupAppointmentFolder.m,
+         Appointments/SOGoAppointmentFolder.m, SOGo/SOGoContentObject.m,
+         SOGo/SOGoUserFolder.m: changed to NGLogging.
+
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * added "Mailer" product

diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog
index 5e20142dfc991e2addd6b3e0b6a5fcb4ff0f0815..68532de49ccaf5b330970c25d841da1a3d504978 100644 (file)
--- a/SOGo/SoObjects/Contacts/ChangeLog
+++ b/SOGo/SoObjects/Contacts/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoContactFolder.m: changed to NGLogging (v0.9.5)
+
 2004-09-25  Helge Hess  <helge.hess@opengroupware.org>
 
        * fixed compilation on MacOSX (v0.9.4)

diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
index 1628c039c87837c4ac75513b1687ef0919b06872..ccd1eea7bf62deca2bc45464bbbf8ee3903f2c09 100644 (file)
--- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m
+++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
@@ -74,7 +74,7 @@ static BOOL debugOn = YES;
   if (ctClass == Nil)
     ctClass = NSClassFromString(@"SOGoContactObject");
   if (ctClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoContactObject class!"];
+    [self errorWithFormat:@"missing SOGoContactObject class!"];
     return nil;
   }
   
@@ -112,7 +112,7 @@ static BOOL debugOn = YES;
                    nil];
   records = [[self ocsFolder] fetchFields:fields matchingQualifier:nil];
   if (records == nil) {
-    [self logWithFormat:@"ERROR(%s): fetch failed!", __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): fetch failed!", __PRETTY_FUNCTION__];
     return nil;
   }
   records = [self fixupRecords:records];

diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version
index 749d66dc7109fb3f49932aae8e0c044ad7d4e6c0..8324e8d48daf7b0092416590ac03c26bd66f5730 100644 (file)
--- a/SOGo/SoObjects/Contacts/Version
+++ b/SOGo/SoObjects/Contacts/Version
@@ -1,3 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=5
+
+# v0.9.5 requires NGExtensions v4.5.136

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index d1941028782e34f0be55df9f1ac5cbd8c16448e1..a8b3bf59e98ea306b37bd27023c44440efd59a2c 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoMailAccount.m, SOGoMailBaseObject.m, SOGoMailObject.m,
+         SOGoMailManager.m, SOGoDraftsFolder.m, SOGoMailAccounts.m,
+         SOGoMailBodyPart.m, SOGoDraftObject.m: changed to use NGLogging
+         (v0.9.55)
+
 2004-11-27  Helge Hess  <helge.hess@skyrix.com>
 
        * SOGoMailAccount.m: added 'Filters' key and lookup of Sieve filters

diff --git a/SOGo/SoObjects/Mailer/SOGoDraftObject.m b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
index e72dfdd125d26eb06da42ddb420aaaf23df60969..14a92522cc154fe723f65ef46f0a297114f4e3d3 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
@@ -85,7 +85,7 @@ static BOOL       debugOn = NO;
     return NO;
   
   if ((fm = [self spoolFileManager]) == nil) {
-    [self logWithFormat:@"ERROR: missing spool file manager!"];
+    [self errorWithFormat:@"missing spool file manager!"];
     return NO;
   }
   return [fm createDirectoriesAtPath:[self draftFolderPath] attributes:nil];
@@ -100,16 +100,16 @@ static BOOL       debugOn = NO;
 
 - (BOOL)storeInfo:(NSDictionary *)_info {
   if (_info == nil) {
-    [self logWithFormat:@"WARNING: got no info to write for draft!"];
+    [self warnWithFormat:@"got no info to write for draft!"];
     return NO;
   }
   if (![self _ensureDraftFolderPath]) {
-    [self logWithFormat:@"ERROR: could not create folder for draft: '%@'",
-           [self draftFolderPath]];
+    [self errorWithFormat:@"could not create folder for draft: '%@'",
+            [self draftFolderPath]];
     return NO;
   }
   if (![_info writeToFile:[self infoPath] atomically:YES]) {
-    [self logWithFormat:@"ERROR: could not write info: '%@'", [self infoPath]];
+    [self errorWithFormat:@"could not write info: '%@'", [self infoPath]];
     return NO;
   }
   return YES;
@@ -128,7 +128,7 @@ static BOOL       debugOn = NO;
   
   self->info = [[NSDictionary alloc] initWithContentsOfFile:p];
   if (self->info == nil)
-    [self logWithFormat:@"ERROR: draft info dictionary broken at path: %@", p];
+    [self errorWithFormat:@"draft info dictionary broken at path: %@", p];
   
   return self->info;
 }
@@ -198,7 +198,7 @@ static BOOL       debugOn = NO;
     return NO;
   
   if (![self _ensureDraftFolderPath]) {
-    [self logWithFormat:@"ERROR: could not create folder for draft!"];
+    [self errorWithFormat:@"could not create folder for draft!"];
     return NO;
   }
   if (![self isValidAttachmentName:_name])
@@ -319,7 +319,7 @@ static BOOL       debugOn = NO;
   fm = [self spoolFileManager];
   p  = [self pathToAttachmentWithName:_name];
   if (![fm isReadableFileAtPath:p]) {
-    [self logWithFormat:@"ERROR: did not find attachment: '%@'", _name];
+    [self errorWithFormat:@"did not find attachment: '%@'", _name];
     return nil;
   }
   attachAsString = NO;
@@ -350,8 +350,8 @@ static BOOL       debugOn = NO;
       [content release]; content = nil;
     }
     else {
-      [self logWithFormat:
-             @"WARNING: could not get text attachment as string: '%@'",_name];
+      [self warnWithFormat:
+              @"could not get text attachment as string: '%@'", _name];
       body = content;
       content = nil;
     }
@@ -446,7 +446,7 @@ static BOOL       debugOn = NO;
   
   if ((emails = [lInfo objectForKey:@"to"]) != nil) {
     if ([emails count] == 0) {
-      [self logWithFormat:@"ERROR: missing 'to' recipient in email!"];
+      [self errorWithFormat:@"missing 'to' recipient in email!"];
       return nil;
     }
     [map setObjects:emails forKey:@"to"];
@@ -489,7 +489,7 @@ static BOOL       debugOn = NO;
   pool = [[NSAutoreleasePool alloc] init];
   
   if ([self fetchInfo] == nil) {
-    [self logWithFormat:@"ERROR: could not locate draft fetch info!"];
+    [self errorWithFormat:@"could not locate draft fetch info!"];
     return nil;
   }
   
@@ -498,8 +498,8 @@ static BOOL       debugOn = NO;
   [self debugWithFormat:@"MIME Envelope: %@", map];
   
   if ((bodyParts = [self bodyPartsForAllAttachments]) == nil) {
-    [self logWithFormat:
-           @"ERROR: could not create body parts for attachments!"];
+    [self errorWithFormat:
+            @"could not create body parts for attachments!"];
     return nil; // TODO: improve error handling, return exception
   }
   [self debugWithFormat:@"attachments: %@", bodyParts];
@@ -594,7 +594,7 @@ static BOOL       debugOn = NO;
   if (mailer == nil)
     mailer = [[NGSendMail sharedSendMail] retain];
   if (![mailer isSendMailAvailable]) {
-    [self logWithFormat:@"ERROR: missing sendmail binary!"];
+    [self errorWithFormat:@"missing sendmail binary!"];
     return [NSException exceptionWithHTTPStatus:500 /* server error */
                        reason:@"did not find sendmail binary!"];
   }
@@ -633,7 +633,7 @@ static BOOL       debugOn = NO;
   NSEnumerator  *e;
   
   if ((fm = [self spoolFileManager]) == nil) {
-    [self logWithFormat:@"ERROR: missing spool file manager!"];
+    [self errorWithFormat:@"missing spool file manager!"];
     return [NSException exceptionWithHTTPStatus:500 /* server error */
                        reason:@"missing spool file manager!"];
   }

diff --git a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m
index f15c312a8e34d9573d8b6065eb3e2d813532dc09..f31d6f49fdb19d2b29a949a97c1a4cabac962398 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m
+++ b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m
@@ -86,7 +86,7 @@ static NSString *spoolFolder = nil;
   NSFileManager *fm;
   
   if ((fm = [self spoolFileManager]) == nil) {
-    [self logWithFormat:@"ERROR: missing spool file manager!"];
+    [self errorWithFormat:@"missing spool file manager!"];
     return NO;
   }
   return [fm createDirectoriesAtPath:[self userSpoolFolderPath]

diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccount.m b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
index 5a6b4b0f2d7eb889f51b9354ef0fa0f7a51cf4fb..ed47e5220b315fb4f5410a88f859f72da26acc56 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
@@ -72,7 +72,7 @@
   s = [self nameInContainer];
   r = [s rangeOfString:@"@"];
   if (r.length == 0) {
-    [self logWithFormat:@"ERROR: missing login in account folder name: %@", s];
+    [self errorWithFormat:@"missing login in account folder name: %@", s];
     return nil;
   }
 

diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccounts.m b/SOGo/SoObjects/Mailer/SOGoMailAccounts.m
index 6536f0b3348b8e6932abff4b690ab3aa4e0b8eee..3f1c24e9ee6dd53d07ea508f7e962f82a123d5a9 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailAccounts.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailAccounts.m
@@ -58,7 +58,7 @@
   if (ctClass == Nil)
     ctClass = NSClassFromString(@"SOGoMailAccount");
   if (ctClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoMailAccount class!"];
+    [self errorWithFormat:@"missing SOGoMailAccount class!"];
     return nil;
   }
   

diff --git a/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m b/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m
index b242f6979715f5cbd209fe0ad56f7ef6e16e1041..e264229124675adbe0333f8dcced33dbabf124ab 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -52,8 +52,8 @@ static BOOL debugOn = YES;
 
 - (SOGoMailAccount *)mailAccountFolder {
   if (![[self container] respondsToSelector:_cmd]) {
-    [self logWithFormat:@"WARNING: weird container of mailfolder: %@",
-           [self container]];
+    [self warnWithFormat:@"weird container of mailfolder: %@",
+            [self container]];
     return nil;
   }
   
@@ -67,13 +67,13 @@ static BOOL debugOn = YES;
 }
 
 - (NSString *)relativeImap4Name {
-  [self logWithFormat:@"WARNING: subclass should override %@", 
+  [self warnWithFormat:@"subclass should override %@", 
          NSStringFromSelector(_cmd)];
   return nil;
 }
 - (NSURL *)baseImap4URL {
   if (![[self container] respondsToSelector:@selector(imap4URL)]) {
-    [self logWithFormat:@"WARNING: container does not implement -imap4URL!"];
+    [self warnWithFormat:@"container does not implement -imap4URL!"];
     return nil;
   }
   
@@ -90,7 +90,7 @@ static BOOL debugOn = YES;
     return nil;
   
   if (![[self container] respondsToSelector:_cmd]) {
-    [self logWithFormat:@"WARNING: container does not implement -imap4URL!"];
+    [self warnWithFormat:@"container does not implement -imap4URL!"];
     return nil;
   }
   

diff --git a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
index d2fd45cd11ed93c262d1087ef79b128faeab6cc7..366bd4436f4109ae4a5f0336e131cbfc8d56df8c 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -141,7 +141,7 @@
     else if ([enc isEqualToString:@"7BIT"])
       ; /* keep data as is */ // TODO: do we need to change encodings?
     else
-      [self debugWithFormat:@"ERROR: unsupported encoding: %@", enc];
+      [self errorWithFormat:@"unsupported encoding: %@", enc];
   }
   
   return data;

diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.m b/SOGo/SoObjects/Mailer/SOGoMailManager.m
index 8616d2754a215870e60b77433235bb4221c87f1b..a785744723b01a524098a40350e448d17f9619b9 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailManager.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailManager.m
@@ -175,14 +175,12 @@ static NSString       *imap4Separator  = nil;
   
   result = [client login:[_url user] password:_pwd];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:
-           @"ERROR: IMAP4 login failed "
-           @"(host=%@,user=%@,pwd=%s,url=%@/%@/%@): "
-           @"%@", 
-           [_url host], [_url user], [_pwd length] > 0 ? "yes" : "no", 
-           [_url absoluteString], [_url baseURL],
-           NSStringFromClass([[_url baseURL] class]),
-           client];
+    [self errorWithFormat:
+            @"IMAP4 login failed (host=%@,user=%@,pwd=%s,url=%@/%@/%@): %@", 
+            [_url host], [_url user], [_pwd length] > 0 ? "yes" : "no", 
+            [_url absoluteString], [_url baseURL],
+            NSStringFromClass([[_url baseURL] class]),
+            client];
     return nil;
   }
   
@@ -342,7 +340,7 @@ static NSString       *imap4Separator  = nil;
   
   result = [[entry client] list:@"INBOX" pattern:@"*"];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: listing of folder failed!"];
+    [self errorWithFormat:@"listing of folder failed!"];
     return nil;
   }
   
@@ -437,19 +435,19 @@ static NSString       *imap4Separator  = nil;
   
   result = [[entry client] select:[self imap4FolderNameForURL:_url]];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not select URL: %@: %@", _url, result];
+    [self errorWithFormat:@"could not select URL: %@: %@", _url, result];
     return nil;
   }
   
   result = [[entry client] sort:_so qualifier:_qualifier encoding:@"UTF-8"];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not sort contents of URL: %@", _url];
+    [self errorWithFormat:@"could not sort contents of URL: %@", _url];
     return nil;
   }
   
   uids = [result valueForKey:@"sort"];
   if (![uids isNotNull]) {
-    [self logWithFormat:@"ERROR: got no UIDs for URL: %@: %@", _url, result];
+    [self errorWithFormat:@"got no UIDs for URL: %@: %@", _url, result];
     return nil;
   }
   
@@ -492,7 +490,7 @@ static NSString       *imap4Separator  = nil;
   
   result = [client select:[self imap4FolderNameForURL:_url]];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not select URL: %@: %@", _url, result];
+    [self errorWithFormat:@"could not select URL: %@: %@", _url, result];
     return nil;
   }
   
@@ -505,7 +503,7 @@ static NSString       *imap4Separator  = nil;
   
   result = [client fetchUids:_uids parts:_parts];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not fetch %d uids for url: %@",
+    [self errorWithFormat:@"could not fetch %d uids for url: %@",
            [_uids count],_url];
     return nil;
   }
@@ -530,7 +528,7 @@ static NSString       *imap4Separator  = nil;
   result = [client select:[self imap4FolderNameForURL:_url
                                removeFileName:YES]];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not select URL: %@: %@", _url, result];
+    [self errorWithFormat:@"could not select URL: %@: %@", _url, result];
     return nil;
   }
   
@@ -540,7 +538,7 @@ static NSString       *imap4Separator  = nil;
   
   result = [client fetchUids:[NSArray arrayWithObject:uid] parts:_parts];
   if (![[result valueForKey:@"result"] boolValue]) {
-    [self logWithFormat:@"ERROR: could not fetch url: %@", _url];
+    [self errorWithFormat:@"could not fetch url: %@", _url];
     return nil;
   }
   //[self logWithFormat:@"RESULT: %@", result];
@@ -568,18 +566,18 @@ static NSString       *imap4Separator  = nil;
   
   result = [result objectForKey:@"fetch"];
   if ([result count] == 0) { /* did not find part */
-    [self logWithFormat:@"ERROR: did not find part: %@", _partId];
+    [self errorWithFormat:@"did not find part: %@", _partId];
     return nil;
   }
   
   fetch = [result objectAtIndex:0];
   if ((body = [fetch objectForKey:@"body"]) == nil) {
-    [self logWithFormat:@"ERROR: did not find body in response: %@", result];
+    [self errorWithFormat:@"did not find body in response: %@", result];
     return nil;
   }
   
   if ((result = [body objectForKey:@"data"]) == nil) {
-    [self logWithFormat:@"ERROR: did not find data in body: %@", fetch];
+    [self errorWithFormat:@"did not find data in body: %@", fetch];
     return nil;
   }
   return result;

diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.m b/SOGo/SoObjects/Mailer/SOGoMailObject.m
index a2a8759bb58861dd7978f959989405fd090b6dac..f79ead811bf60e1e5fe13fc90ada6d3d2fc3d69b 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailObject.m
@@ -175,7 +175,7 @@ static BOOL heavyDebug = NO;
   id info;
   
   if ((info = [self bodyStructure]) == nil) {
-    [self logWithFormat:@"ERROR: got no body part structure!"];
+    [self errorWithFormat:@"got no body part structure!"];
     return nil;
   }
   
@@ -190,9 +190,8 @@ static BOOL heavyDebug = NO;
     
     parts = [info valueForKey:@"parts"];
     if (idx >= [parts count]) {
-      [self logWithFormat:
-             @"ERROR: body part index out of bounds(%d vs %d): %@", 
-             (idx + 1), [parts count], info];
+      [self errorWithFormat:@"body part index out of bounds(%d vs %d): %@", 
+              (idx + 1), [parts count], info];
       return nil;
     }
     info = [parts objectAtIndex:idx];

diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index c396f936017bf54b48c16bab35ce23244fd04143..0c6616149ffa25559b26c6a322bc8987288c4dc2 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,7 +1,8 @@
 # Version file
 
-SUBMINOR_VERSION:=54
+SUBMINOR_VERSION:=55
 
+# v0.9.55 requires NGExtensions v4.5.136
 # v0.9.44 requires libNGMime    v4.3.194
 # v0.9.41 requires libNGMime    v4.3.190
 # v0.9.35 requires libSOGoLogic v0.9.24

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m
index 1419b0a268af15dba7dffd98a3d940ecf6cbe733..ecbc3b2a8acfbeb77009e88701d7c37bc82247ce 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m
@@ -50,7 +50,7 @@
     return;
   
   if (self->ocsPath)
-    [self logWithFormat:@"WARNING: OCS path is already set! '%@'", _path];
+    [self warnWithFormat:@"OCS path is already set! '%@'", _path];
   
   ASSIGNCOPY(self->ocsPath, _path);
 }

diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m
index 1c33b944c4d7e20d6aab56572971d9a701e27d13..a628e57718013a47e725d87613a07512a33fa0c8 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoFolder.m
@@ -44,7 +44,7 @@
     return;
   
   if (self->ocsPath)
-    [self logWithFormat:@"WARNING: OCS path is already set! '%@'", _path];
+    [self warnWithFormat:@"OCS path is already set! '%@'", _path];
   
   ASSIGNCOPY(self->ocsPath, _path);
 }
@@ -72,7 +72,7 @@
   fields = [NSArray arrayWithObject:@"c_name"];
   records = [[self ocsFolder] fetchFields:fields matchingQualifier:nil];
   if (![records isNotNull]) {
-    [self logWithFormat:@"ERROR(%s): fetch failed!", __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): fetch failed!", __PRETTY_FUNCTION__];
     return nil;
   }
   if ([records isKindOfClass:[NSException class]])
@@ -84,7 +84,7 @@
   
   files = [[self ocsFolder] fetchContentsOfAllFiles];
   if (![files isNotNull]) {
-    [self logWithFormat:@"ERROR(%s): fetch failed!", __PRETTY_FUNCTION__];
+    [self errorWithFormat:@"(%s): fetch failed!", __PRETTY_FUNCTION__];
     return nil;
   }
   if ([files isKindOfClass:[NSException class]])

diff --git a/SOGo/SoObjects/SOGo/SOGoUserFolder.m b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
index 8c16f4af050b65a6ac58076afdc1ea7f91309266..92ab65076928d0b49bf9fb59d819fb798527d1f8 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
@@ -65,9 +65,8 @@
 /* pathes */
 
 - (void)setOCSPath:(NSString *)_path {
-  [self logWithFormat:
-         @"WARNING: rejected attempt to reset user-folder path: '%@'",
-         _path];
+  [self warnWithFormat:
+          @"rejected attempt to reset user-folder path: '%@'", _path];
 }
 - (NSString *)ocsPath {
   return [@"/Users/" stringByAppendingString:[self login]];
@@ -92,7 +91,7 @@
   if (calClass == Nil)
     calClass = NSClassFromString(@"SOGoAppointmentFolder");
   if (calClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoAppointmentFolder class!"];
+    [self errorWithFormat:@"missing SOGoAppointmentFolder class!"];
     return nil;
   }
   
@@ -108,7 +107,7 @@
   if (calClass == Nil)
     calClass = NSClassFromString(@"SOGoContactFolder");
   if (calClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoContactFolder class!"];
+    [self errorWithFormat:@"missing SOGoContactFolder class!"];
     return nil;
   }
   
@@ -124,7 +123,7 @@
   if (fldClass == Nil)
     fldClass = NSClassFromString(@"SOGoGroupsFolder");
   if (fldClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoGroupsFolder class!"];
+    [self errorWithFormat:@"missing SOGoGroupsFolder class!"];
     return nil;
   }
   
@@ -139,7 +138,7 @@
   if (fldClass == Nil)
     fldClass = NSClassFromString(@"SOGoMailAccounts");
   if (fldClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoMailAccounts class!"];
+    [self errorWithFormat:@"missing SOGoMailAccounts class!"];
     return nil;
   }
   

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 0397ac38178dd102bc1bad326193d8d2cbc021d6..5bdf735e7d8c33d913db02c2752c39c8d489b9c5 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxTabItem.m: changed to use NGLogging (v0.9.28)
+
 2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.27

diff --git a/SOGo/UI/Common/UIxTabItem.m b/SOGo/UI/Common/UIxTabItem.m
index 21046f9d929145c244f7d4611a433722ac79b3c8..46a4cb7131f832ff5742f6699ccf65517c416096 100644 (file)
--- a/SOGo/UI/Common/UIxTabItem.m
+++ b/SOGo/UI/Common/UIxTabItem.m
@@ -407,7 +407,8 @@ static NSString *retStrForInt(int i) {
           activeKey:tmp key:k];
   }
   else {
-    NSLog(@"WARNING(%s): invalid UIxTabItem state !!!", __PRETTY_FUNCTION__);
+    [self warnWithFormat:@"(%s): invalid UIxTabItem state !!!",
+            __PRETTY_FUNCTION__];
     [_response appendContentString:@"[invalid state]"];
   }
 }

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index cbe756794b8f95c1a0813a588adb688acb81f51f..5a2df97aeb100bc37ec9dc9ca7300f7a58bccf8b 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=27
+SUBMINOR_VERSION:=28
+
+# v0.9.28 requires NGExtensions v4.5.136

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index e1ad02d0c2a87922e86be32a28d55e6a24eac780..254707846640ffacd0bcc39a69cc552ddaa24dc5 100644 (file)
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxContactEditor.m: changed to use NGLogging (v0.9.18)
+
 2004-10-27  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.17

diff --git a/SOGo/UI/Contacts/UIxContactEditor.m b/SOGo/UI/Contacts/UIxContactEditor.m
index e2a7894f44de6a1a629cc79b1cd95f04ac5b160e..5d6e5305faec1d211280009e43139a5079d98c36 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactEditor.m
+++ b/SOGo/UI/Contacts/UIxContactEditor.m
@@ -87,7 +87,7 @@
   NSDictionary *plist;
   
   if ((plist = [_s propertyList]) == nil) {
-    [self logWithFormat:@"ERROR: could not parse content string!"];
+    [self errorWithFormat:@"could not parse content string!"];
     return;
   }
   

diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version
index e8534dd85ccd7dc8289c7448dd04db369abb0324..e66b6e906368b924f77aca09a243f86a27fd286e 100644 (file)
--- a/SOGo/UI/Contacts/Version
+++ b/SOGo/UI/Contacts/Version
@@ -1,5 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=17
+SUBMINOR_VERSION:=18
 
-# v0.9.16 requires libSOGoUI v0.9.16
+# v0.9.18 requires NGExtensions v4.5.136
+# v0.9.16 requires libSOGoUI    v0.9.16

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 31195dd32efe757b67257447319cf142eff76a8e..cc6f5927006c9fe23a179c6d59579442e35a3a96 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+        * UIxMailTree.m, UIxMailEditor.m, UIxMailPartViewer.m,
+          UIxEnvelopeAddressFormatter.m, UIxMailToolbar.m,
+          UIxMailRenderingContext.m, UIxMailEditorAttach.m,
+          UIxSubjectFormatter.m, UIxMailPartAlternativeViewer.m:
+          changed to use NGLogging (v0.9.70)
+
 2004-12-03  Helge Hess  <helge.hess@skyrix.com>
 
        * v0.9.69

diff --git a/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m b/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
index 5330e571145de75940b7bc841a7f1ef69bdc07da..4a94964698b1b883ec7d77ccc8744998655105f2 100644 (file)
--- a/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
+++ b/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
@@ -72,7 +72,7 @@ static Class StrClass     = Nil;
   s = [_address baseEMail];
   if ([s isNotNull]) return s;
   
-  [self debugWithFormat:@"WARNING: unexpected envelope address: %@", _address];
+  [self warnWithFormat:@"unexpected envelope address: %@", _address];
   return [_address stringValue];
 }
 

diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index 7e523c3071cad898a033f1831353a39af73f5ee9..9f3af7b2a8a37cc3f0358fa6b8a4034123b473ae 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -161,7 +161,7 @@ static NSArray *infoKeys = nil;
   
   if ((info = [self storeInfo]) != nil) {
     if (![[self clientObject] storeInfo:info]) {
-      [self logWithFormat:@"ERROR: failed to store draft!"];
+      [self errorWithFormat:@"failed to store draft!"];
       // TODO: improve error handling
       return NO;
     }
@@ -222,7 +222,7 @@ static NSArray *infoKeys = nil;
   
   [self logWithFormat:@"TODO: store mail in Sent folder: %@", mailPath];
   if (keepMailTmpFile)
-    [self logWithFormat:@"WARNING: keeping mail file: '%@'", mailPath];
+    [self warnWithFormat:@"keeping mail file: '%@'", mailPath];
   else
     [[NSFileManager defaultManager] removeFileAtPath:mailPath handler:nil];
   mailPath = nil;
@@ -230,8 +230,8 @@ static NSArray *infoKeys = nil;
   /* delete draft */
   
   if (keepDraftAfterSend) {
-    [self logWithFormat:@"WARNING: keeping draft object: '%@'", 
-           [self clientObject]];
+    [self warnWithFormat:@"keeping draft object: '%@'", 
+            [self clientObject]];
   }
   else if ((error = [[self clientObject] delete]) != nil)
     return error;

diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/Mailer/UIxMailEditorAttach.m
index 88c33e763b471e9daef5053c3cb5c041e93bddc5..11b54a12ff7c944bf74df18a74cf94d7037db89b 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditorAttach.m
+++ b/SOGo/UI/Mailer/UIxMailEditorAttach.m
@@ -153,7 +153,7 @@
     if (![usedNames containsObject:name])
       return name;
   }
-  [self logWithFormat:@"ERROR: too many attachments?!"];
+  [self errorWithFormat:@"too many attachments?!"];
   return nil;
 }
 

diff --git a/SOGo/UI/Mailer/UIxMailPartAlternativeViewer.m b/SOGo/UI/Mailer/UIxMailPartAlternativeViewer.m
index 95f5345e9d62ec47e813506742f96ef4354065fe..1dd96605f3fda43e9b3548961a075ae5dff1f219 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailPartAlternativeViewer.m
+++ b/SOGo/UI/Mailer/UIxMailPartAlternativeViewer.m
@@ -111,8 +111,8 @@
   
   idx = [self selectPartIndexFromTypes:[self childPartTypes]];
   if (idx == NSNotFound) {
-    [self logWithFormat:@"ERROR: could not select a part of types: %@",
-           [self childPartTypes]];
+    [self errorWithFormat:@"could not select a part of types: %@",
+            [self childPartTypes]];
     return;
   }
   

diff --git a/SOGo/UI/Mailer/UIxMailPartViewer.m b/SOGo/UI/Mailer/UIxMailPartViewer.m
index f032bb7b11c0fc7658afa6023100805bab0f842f..c0889777704cc5ff09e53d21a329b29815bb6462 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailPartViewer.m
+++ b/SOGo/UI/Mailer/UIxMailPartViewer.m
@@ -96,7 +96,7 @@
   if ([enc isEqualToString:@"quoted-printable"])
     return [[self flatContent] dataByDecodingQuotedPrintable];
   
-  [self logWithFormat:@"ERROR: unsupported MIME encoding: %@", enc];
+  [self errorWithFormat:@"unsupported MIME encoding: %@", enc];
   return [self flatContent];
 }
 
@@ -107,7 +107,7 @@
   NSData   *content;
   
   if ((content = [self decodedFlatContent]) == nil) {
-    [self logWithFormat:@"ERROR: got no text content: %@", [self partPath]];
+    [self errorWithFormat:@"got no text content: %@", [self partPath]];
     return nil;
   }
   
@@ -125,9 +125,8 @@
     s = [s autorelease];
   }
   if (s == nil) {
-    [self logWithFormat:
-           @"ERROR: could not convert content to text, charset: '%@'",
-           charset];
+    [self errorWithFormat:@"could not convert content to text, charset: '%@'",
+            charset];
   }
   return s;
 }

diff --git a/SOGo/UI/Mailer/UIxMailRenderingContext.m b/SOGo/UI/Mailer/UIxMailRenderingContext.m
index b7aac88a52bf5579049ff214690525a7162c3eb5..0346c09b2a4ecba1decf50c9236a1a4b09ad0237 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailRenderingContext.m
+++ b/SOGo/UI/Mailer/UIxMailRenderingContext.m
@@ -139,7 +139,7 @@
   }
 
   // TODO: always fallback to octet viewer?!
-  [self logWithFormat:@"ERROR: found no viewer for MIME type: %@/%@", mt, st];
+  [self errorWithFormat:@"found no viewer for MIME type: %@/%@", mt, st];
   return nil;
 }
 

diff --git a/SOGo/UI/Mailer/UIxMailToolbar.m b/SOGo/UI/Mailer/UIxMailToolbar.m
index 82a6d0c2fcfa9a35f4140afc24aa96193c0aea3f..ac56d416102618b7b8c899372be3e615e745b2de 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailToolbar.m
+++ b/SOGo/UI/Mailer/UIxMailToolbar.m
@@ -81,9 +81,9 @@
   tmp = [[self clientObject] lookupName:@"toolbar" inContext:[self context]
                             acquire:NO];
   if ([tmp isKindOfClass:[NSException class]]) {
-    [self logWithFormat:
-           @"ERROR: not toolbar configuration found on SoObject: %@ (%@)",
-           [self clientObject], [[self clientObject] soClass]];
+    [self errorWithFormat:
+            @"not toolbar configuration found on SoObject: %@ (%@)",
+            [self clientObject], [[self clientObject] soClass]];
     self->toolbarConfig = [[NSNull null] retain];
     return nil;
   }
@@ -113,7 +113,7 @@
   if ((rm = [self resourceManager]) == nil)
     rm = [[WOApplication application] resourceManager];
   if (rm == nil)
-    [self debugWithFormat:@"WARNING: missing resource manager!"];
+    [self warnWithFormat:@"missing resource manager!"];
   
   /* lookup string */
   

diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/Mailer/UIxMailTree.m
index 6bc9edf8434d9e75ea44711be5970e97bd9cffdf..5870cfb7dc326e81efe3ed1b07abbb91ff00e5ca 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailTree.m
+++ b/SOGo/UI/Mailer/UIxMailTree.m
@@ -57,8 +57,8 @@
 
 - (BOOL)isRootObject:(id)_object {
   if (![_object isNotNull]) {
-    [self logWithFormat:@"WARNING(%s): got to root by nil lookup ...",
-           __PRETTY_FUNCTION__];
+    [self warnWithFormat:@"(%s): got to root by nil lookup ...",
+            __PRETTY_FUNCTION__];
     return YES;
   }
   

diff --git a/SOGo/UI/Mailer/UIxSubjectFormatter.m b/SOGo/UI/Mailer/UIxSubjectFormatter.m
index 396d8b2110a816743dda054814c8106f50c18e99..1ef2fc1a69fd6534cf200f1841bed2e48e34a1cc 100644 (file)
--- a/SOGo/UI/Mailer/UIxSubjectFormatter.m
+++ b/SOGo/UI/Mailer/UIxSubjectFormatter.m
@@ -116,12 +116,12 @@ static Class DataClass = Nil;
   
   /* continue NSData processing */
   
-  [self debugWithFormat:@"WARNING: NSData subject! (using UTF-8 to decode!)"];
+  [self warnWithFormat:@"NSData subject! (using UTF-8 to decode!)"];
 
   // TODO: exception handler?
   s = [[NSString alloc] initWithData:_subject encoding:NSUTF8StringEncoding];
   if (s == nil) {
-    [self logWithFormat:@"ERROR: could do not decode NSData subject!"];
+    [self errorWithFormat:@"could do not decode NSData subject!"];
     return [self labelForKey:@"Error_CouldNotDecodeSubject"];
   }
   

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 8bbbec8f5d26e8882816797423c0950b1ccb362f..a78e396457cd4e1de5f4d3bbf95a376d25bc3efb 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,8 +1,9 @@
 # version file
 
-SUBMINOR_VERSION:=69
+SUBMINOR_VERSION:=70
 
-# v0.9.69 requires libNGMime   v4.5.203
-# v0.9.50 requires libNGMime   v4.3.190
-# v0.9.43 requires libNGObjWeb v4.3.73
-# v0.9.42 requires libNGObjWeb v4.3.72
+# v0.9.70 requires NGExtensions v4.5.136
+# v0.9.69 requires libNGMime    v4.5.203
+# v0.9.50 requires libNGMime    v4.3.190
+# v0.9.43 requires libNGObjWeb  v4.3.73
+# v0.9.42 requires libNGObjWeb  v4.3.72

diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index 4648fe3796eb87a1d608fa17793cb270c98fb291..57a9ab7a8c7d6141850d92e087edd47586c9159b 100644 (file)
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxComponent.m: changed to use NGLogging (v0.9.18)
+
 2004-10-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxComponent.m: rewrote handling of queryParameters, these get

diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index 51be44ee637ad5749d3544c8e6c9f6ecfebc9227..30c049f948c6eafdc5e03ed9b34068f742075059 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -357,7 +357,7 @@ static BOOL uixDebugEnabled = NO;
   if ((rm = [self resourceManager]) == nil)
     rm = [[WOApplication application] resourceManager];
   if (rm == nil)
-    [self debugWithFormat:@"WARNING: missing resource manager!"];
+    [self warnWithFormat:@"missing resource manager!"];
     
   /* get parameters */
     

diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version
index 33dfbe1b04726220aa5142e7e070a02c182f5657..4c33edb4dced11958f416f92af6482cb6aef99a9 100644 (file)
--- a/SOGo/UI/SOGoUI/Version
+++ b/SOGo/UI/SOGoUI/Version
@@ -1,3 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=17
+SUBMINOR_VERSION:=18
+
+# v0.9.18 requires NGExtensions v4.5.136

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 6a2c29e4a08d559b83fc82523e31aa6cf93bfcbe..6e8cbb0d7d304a22e161cc2c5e0a604e1134412f 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxAppointmentView.m, UIxDatePicker.m, UIxCalView.m: changed to use
+         NGLogging (v0.9.94)
+
 2004-11-08  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxAppointmentPrintview.m: fixed a compile warning (v0.9.93)

diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.m b/SOGo/UI/Scheduler/UIxAppointmentView.m
index 9b133b88b42cf445592a378f96de44e4c8a32531..a892a06b72b6045f1cda6ae2fcc8009e19c53787 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentView.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.m
@@ -105,7 +105,7 @@
     
   iCalString = [[self clientObject] valueForKey:@"iCalString"];
   if (![iCalString isNotNull] || [iCalString length] == 0) {
-    [self debugWithFormat:@"ERROR(%s): missing iCal string!", 
+    [self errorWithFormat:@"(%s): missing iCal string!", 
             __PRETTY_FUNCTION__];
     return nil;
   }

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 9338e3c5f4c32ba2deffebae705c2a69bc52a4e0..5515e3f8058e6f86bdd2dcde4579aeb361960eae 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -296,14 +296,14 @@ static BOOL shouldDisplayWeekend = NO;
                        stringByAppendingString:@"/Calendar"];
     
     if ((folder = [[self clientObject] ocsFolderForPath:path]) == nil) {
-      [self logWithFormat:@"ERROR: did not find user: %@", uid];
+      [self errorWithFormat:@"did not find user: %@", uid];
       continue;
     }
     
     res = [[self clientObject] fetchCoreInfosFromFolder:folder 
                               from:[self startDate] to:[self endDate]];
     if (res == nil) {
-      [self logWithFormat:@"ERROR: fetch failed for user: %@", uid];
+      [self errorWithFormat:@"fetch failed for user: %@", uid];
       continue;
     }
 

diff --git a/SOGo/UI/Scheduler/UIxDatePicker.m b/SOGo/UI/Scheduler/UIxDatePicker.m
index 121737be778842e5066af2ae11788f5dae207416..3f8e95193956b63fe4aef9c06438d6393e2ff98d 100644 (file)
--- a/SOGo/UI/Scheduler/UIxDatePicker.m
+++ b/SOGo/UI/Scheduler/UIxDatePicker.m
@@ -106,7 +106,7 @@
   if ((rm = [self resourceManager]) == nil)
     rm = [[WOApplication application] resourceManager];
   if (rm == nil)
-    [self debugWithFormat:@"WARNING: missing resource manager!"];
+    [self warnWithFormat:@"missing resource manager!"];
 
   /* lookup languages */
     
@@ -162,8 +162,8 @@
 
   d = [NSCalendarDate dateWithString:dateString calendarFormat:@"%Y-%m-%d"];
   if (d == nil)
-    [self logWithFormat:@"WARNING: Could not parse dateString: '%@'", 
-         dateString];
+    [self warnWithFormat:@"Could not parse dateString: '%@'", 
+            dateString];
   [self setDay:[NSNumber numberWithInt:[d dayOfMonth]]];
   [self setMonth:[NSNumber numberWithInt:[d monthOfYear]]];
   [self setYear:[NSNumber numberWithInt:[d yearOfCommonEra]]];

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 6658e9847335c15b02d701caadd5544fdccf3b90..5eda7ea385a0545dafbfd36fa8aa359f61b82167 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,11 +1,12 @@
 # $Id$
 
-SUBMINOR_VERSION:=93
+SUBMINOR_VERSION:=94
 
-# v0.9.84 requires libSOGoLogic    v0.9.12
-# v0.9.70 requires libNGExtensions v4.3.107
-# v0.9.67 requires SOPE 4.3
-# v0.9.61 requires libNGExtensions v4.2.102
-# v0.9.41 requires libNGObjWeb     v4.2.431
-# v0.9.31 requires libWEExtensions v4.2.52
-# v0.9.29 requires libWEExtensions v4.2.51
+# v0.9.94 requires NGExtensions v4.5.136
+# v0.9.84 requires SOGoLogic    v0.9.12
+# v0.9.70 requires NGExtensions v4.3.107
+# v0.9.67 requires SOPE         v4.3
+# v0.9.61 requires NGExtensions v4.2.102
+# v0.9.41 requires NGObjWeb     v4.2.431
+# v0.9.31 requires WEExtensions v4.2.52
+# v0.9.29 requires WEExtensions v4.2.51

diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog
index 76b8d4528a6cb3deca6dd5819847e48c554bf19c..434cb5bf60b35b47a4a4d32f1876930d50a3864f 100644 (file)
--- a/SOGoLogic/ChangeLog
+++ b/SOGoLogic/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoAppointment.m, SOGoAppointmentICalRenderer.m: changed to use
+         NGLogging (v0.9.26)
+
 2004-11-01  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.25

diff --git a/SOGoLogic/SOGoAppointment.m b/SOGoLogic/SOGoAppointment.m
index 0f3865d868e66490259d83d324658bc7b1513982..947f575b450e7595e64d40957e75b0538f9e66c9 100644 (file)
--- a/SOGoLogic/SOGoAppointment.m
+++ b/SOGoLogic/SOGoAppointment.m
@@ -65,9 +65,9 @@ static SaxObjectDecoder          *sax   = nil;
     }
     else if ([_root isKindOfClass:[NSDictionary class]]) {
       /* multiple vevents in the calendar */
-      [self logWithFormat:
-             @"ERROR(%s): tried to initialize with multiple records: %@",
-             __PRETTY_FUNCTION__, _root];
+      [self errorWithFormat:
+              @"(%s): tried to initialize with multiple records: %@",
+              __PRETTY_FUNCTION__, _root];
       [self release];
       return nil;
     }
@@ -82,12 +82,12 @@ static SaxObjectDecoder          *sax   = nil;
   id root;
   
   if ([_iCal length] == 0) {
-    [self logWithFormat:@"ERROR: tried to init SOGoAppointment without iCal"];
+    [self errorWithFormat:@"tried to init SOGoAppointment without iCal"];
     [self release];
     return nil;
   }
   if (parser == nil || sax == nil) {
-    [self logWithFormat:@"ERROR: iCal parser not properly set up!"];
+    [self errorWithFormat:@"iCal parser not properly set up!"];
     [self release];
     return nil;
   }
@@ -251,7 +251,7 @@ static SaxObjectDecoder          *sax   = nil;
 
 - (void)setDuration:(NSTimeInterval)_duration {
   // TODO
-  [self logWithFormat:@"WARNING: could not apply duration!"];
+  [self warnWithFormat:@"could not apply duration!"];
 }
 - (BOOL)hasDuration {
   return [self->event hasDuration];

diff --git a/SOGoLogic/SOGoAppointmentICalRenderer.m b/SOGoLogic/SOGoAppointmentICalRenderer.m
index b95b8a102ab7b1a0245c81ccdc10a2e289e8bb23..653e5d28c8a538608183830b54c97af27b74c952 100644 (file)
--- a/SOGoLogic/SOGoAppointmentICalRenderer.m
+++ b/SOGoLogic/SOGoAppointmentICalRenderer.m
@@ -191,16 +191,14 @@ static unsigned DefaultICalStringCapacity = 1024;
     return NO;
   
   if ([[_apt uid] length] == 0) {
-    [self logWithFormat:
-           @"WARNING: got apt without uid, rejecting iCal generation: %@", 
-           _apt];
+    [self warnWithFormat:@"got apt without uid, rejecting iCal generation: %@", 
+            _apt];
     return NO;
   }
   if ([[[_apt startDate] icalString] length] == 0) {
-    [self logWithFormat:
-           @"WARNING: got apt without start date, "
-           @"rejecting iCal generation: %@",
-           _apt];
+    [self warnWithFormat:@"got apt without start date, "
+            @"rejecting iCal generation: %@",
+            _apt];
     return NO;
   }
   

diff --git a/SOGoLogic/Version b/SOGoLogic/Version
index 6238c96506b08fb3fc85ed4410e575bb42a629b4..e1570ae4602049b5009a71746e45b5163d2bda12 100644 (file)
--- a/SOGoLogic/Version
+++ b/SOGoLogic/Version
@@ -1,7 +1,8 @@
 # Version file
 
-SUBMINOR_VERSION:=25
+SUBMINOR_VERSION:=26
 
+# v0.9.26 requires NGExtensions  v4.5.136
 # v0.9.23 requires NGiCal        v4.3.32
 # v0.9.18 requires NGExtensions  v4.3.123
 # v0.9.13 requires libFoundation v1.0.62