fixed minor annoyances

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

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index d9cfcb16c75d7b9326cc3450a83eebedc38f5ec4..1ced8a06841980e1c3d8252261b80f7492f6d1f4 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -1505,6 +1505,7 @@
                };
                AD85C73107C4E8740036AC7A = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = SOGoGroupFolder.m;

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 62da83cdaf4af40079f8d3bdac4c09b1ce80f759..5af97f2b60a9486c457a1d3242215fb2f5871773 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-03  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoGroupFolder.m: switched logging to NGLogging (v0.9.33)
+
 2005-03-02  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NSObject+AptComparison.[hm]: new comparison method. This is used

diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
index b85a9306c364b514a4c6cfd5a03537488e7a4b05..c3bce605fddd245842c607d4e0dd16af008a55f0 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
@@ -25,16 +25,35 @@
 
 @implementation SOGoGroupFolder
 
+static NGLogger *logger = nil;
+
++ (void)initialize {
+  NGLoggerManager *lm;
+  static BOOL     didInit = NO;
+  
+  if (didInit) return;
+  didInit = YES;
+  
+  lm     = [NGLoggerManager defaultLoggerManager];
+  logger = [lm loggerForDefaultKey:@"SOGoGroupFolderDebugEnabled"];
+}
+
 - (void)dealloc {
   [self->uidToFolder release];
   [self->folders     release];
   [super dealloc];
 }
 
+/* logging */
+
+- (NGLogger *)debugLogger {
+  return logger;
+}
+
 /* accessors */
 
 - (NSArray *)uids {
-  [self logWithFormat:@"ERROR: instantiated abstract Group folder class!"];
+  [self errorWithFormat:@"instantiated abstract Group folder class!"];
   return nil;
 }
 
@@ -48,7 +67,7 @@
   /* 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;
   }
   
@@ -61,13 +80,14 @@
   result = [[ctx application] traversePathArray:path inContext:ctx
                              error:&error acquire:NO];
   if (error != nil) {
-    [self logWithFormat:@"ERROR: folder lookup failed (uid=%@): %@",
+    [self errorWithFormat:@"folder lookup failed (uid=%@): %@",
            _uid, error];
     return nil;
   }
   
-  [self debugWithFormat:@"Note: got folder for uid %@ path %@: %@",
-         _uid, [path componentsJoinedByString:@"=>"], result];
+  if (logger)
+    [self debugWithFormat:@"Note: got folder for uid %@ path %@: %@",
+                               _uid, [path componentsJoinedByString:@"=>"], result];
   return result;
 }
 
@@ -155,7 +175,7 @@
   if (calClass == Nil)
     calClass = NSClassFromString(@"SOGoGroupAppointmentFolder");
   if (calClass == Nil) {
-    [self logWithFormat:@"ERROR: missing SOGoGroupAppointmentFolder class!"];
+    [self errorWithFormat:@"missing SOGoGroupAppointmentFolder class!"];
     return nil;
   }
   

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 2d0e88fb5e05b922733c5662d5f133746073c5c1..b36c56a5d2449fdaf20a83b94c8e54213475bbb3 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33
 
 # v0.9.26 requires libOGoContentStore v0.9.13

diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog
index f2c6a0fae90af3ccce5eefe8dfd019766cf65caf..de71fa9d85a1312fe05d4aefdfd301779b2ef9c2 100644 (file)
--- a/SOGo/UI/ChangeLog
+++ b/SOGo/UI/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-03  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxCalWeekOverview.wox: some pretty printing
+
 2005-02-17  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * common.make: removed dependency to removed libSOGoLogic

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index cf548f330faea8ac7c133c74c867db75464bb504..b29b3fbe0f27933dca95233eb72a119d0397f340 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,7 @@
 2005-03-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * UIxCalWeekListview.m: fixed compile warnings (v0.9.120)
+
        * UIxCalWeekListview.m: view needs to fetch coreInfos instead of just
          overviews because it needs information stored in "partmails". Fixes
          SOGo Bug #1248. (v0.9.119)

diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.m b/SOGo/UI/Scheduler/UIxCalWeekListview.m
index d77321f1f754eeafe546a3397fcfa199b9b2bb18..fcf4d689c102f09701a67b1a433c523bb3c015ed 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekListview.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekListview.m
@@ -37,6 +37,7 @@
 #include <NGExtensions/NGCalendarDateRange.h>
 #include <SOGo/AgenorUserManager.h>
 #include <SOGoUI/SOGoAptFormatter.h>
+#include "SoObjects/Appointments/SOGoAppointmentFolder.h"
 
 @implementation UIxCalWeekListview
 

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index add46b1e3cea60315d0d5c07253f2b7de2bf1b5a..6de1c8724fa45056b4ad53a8e2800ad4b8407f95 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=119
+SUBMINOR_VERSION:=120
 
 # v0.9.115 requires NGiCal       v4.5.44
 # v0.9.113 requires libSOGo      v0.9.30

diff --git a/SOGo/UI/Templates/UIxCalWeekOverview.wox b/SOGo/UI/Templates/UIxCalWeekOverview.wox
index 5a290f7c4b71c44e4a00f394e220c905aab1740b..486a717fa316b98f33d97f47c6d588ff47d013ca 100644 (file)
--- a/SOGo/UI/Templates/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Templates/UIxCalWeekOverview.wox
@@ -182,9 +182,11 @@
   </tr>
   <tr bgcolor="#F5F5E9"> <!-- use CSS -->
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img 
-     border="0" alt="" 
-     src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif" /></td>
+  <td align="right"
+  ><img border="0"
+        alt=""
+        src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
+   /></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9"> <!-- use CSS -->