disabled banner

improved mail tree block debugging

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

diff --git a/UI/MailerUI/ChangeLog b/UI/MailerUI/ChangeLog
index bb47ed18c567deec0ad826c932ed0c719a08416f..c5ec6ef3e8c0ccf48f372b2b0ac7413cefb208c7 100644 (file)
--- a/UI/MailerUI/ChangeLog
+++ b/UI/MailerUI/ChangeLog
@@ -1,5 +1,13 @@
+2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * UIxMailTree.m: improved block debugging (v0.9.172)
+
 2005-07-23  Helge Hess  <helge.hess@opengroupware.org>
 
+       * v0.9.171
+
+       * UIxMailMainFrame.m: disabled Agenor app banner
+
        * UIxMailToSelection.m, UIxMailFormatter.m: fixed gcc 4.0 warnings
 
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 031ebff98042b0e3fa90dd17000f838d4fc34c72..9a6915e457f04719f081d59f63230bd91888dc25 100644 (file)
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -150,22 +150,13 @@ static NSString *treeRootClassName = nil;
 }
 
 - (BOOL)showLinkBanner {
-  if ([self hideFolderTree]) return NO;
-  return YES;
+  return NO;
 }
 - (NSString *)bannerToolbarStyle {
-#if 0 // 32x32
-  return [self showLinkBanner] ? @"top: 58px;" : nil /* fallback to CSS */;
-#else // 24x24
-  return [self showLinkBanner] ? @"top: 58px;" : nil /* fallback to CSS */;
-#endif
+  return nil;
 }
 - (NSString *)bannerConsumeStyle {
-#if 0 // 32x32
-  return [self showLinkBanner] ? @"height: 116px;" : nil /* fallback to CSS */;
-#else // 24x24
-  return [self showLinkBanner] ? @"height: 110px;" : nil /* fallback to CSS */;
-#endif
+  return nil;
 }
 
 /* notifications */

diff --git a/UI/MailerUI/UIxMailTree.m b/UI/MailerUI/UIxMailTree.m
index a6538ec8798e9f68f32344234dbcd78c72d633b3..e6482767453558e5f8be6d16c9c54f8f27651f53 100644 (file)
--- a/UI/MailerUI/UIxMailTree.m
+++ b/UI/MailerUI/UIxMailTree.m
@@ -139,15 +139,29 @@ static BOOL debugBlocks = NO;
   for (i = 0; i < count; i++) {
     id folder;
     
+    // TODO: use some context or reuse the main context?
     folder = [_object lookupName:[names objectAtIndex:i] inContext:nil 
                      acquire:NO];
-    if (folder == nil)
+    if (folder == nil) {
+      if (debugBlocks) {
+       [self logWithFormat:@"  DID NOT FIND FOLDER %@: %@",
+               _object,
+               [names objectAtIndex:i]];
+      }
       continue;
-    if ([folder isKindOfClass:[NSException class]])
+    }
+    if ([folder isKindOfClass:[NSException class]]) {
+      if (debugBlocks) {
+       [self logWithFormat:@"  FOLDER LOOKUP EXCEPTION %@: %@",
+               [names objectAtIndex:i], folder];
+      }
       continue;
+    }
     
     [ma addObject:folder];
   }
+  if (debugBlocks)
+    [self logWithFormat:@"  returning: %@ %@", _object, ma];
   return ma;
 }
 

diff --git a/UI/MailerUI/Version b/UI/MailerUI/Version
index d781c774e6cd945b30782fae963ec2e1222a49d8..08fd93f977ba3e391af139bc05cf8b4ef96287f6 100644 (file)
--- a/UI/MailerUI/Version
+++ b/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=170
+SUBMINOR_VERSION:=172
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41