From 92d0e3ca2ea100c947e5eac19fd38da25379e119 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 5 Feb 2007 22:21:53 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1017
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                 |  4 ++++
 UI/MailerUI/GNUmakefile   |  2 +-
 UI/MailerUI/UIxMailTree.m | 12 ++++++------
 UI/MailerUI/product.plist | 19 +++++++++----------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68a071c6..3d056c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailTree.m ([UIxMailTree
+	-getTitle:folderType:andIcon:forObject:]): disabled Sieve folders
+	for the moment.
+
 	* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
 	-checkLogin:_loginpassword:_pwd]): fixed a bug where a wrong
 	password would be accepted anyway as long as its length was > 0.
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 3055d8fa..285a419a 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -39,9 +39,9 @@ MailerUI_OBJC_FILES += \
 	UIxMailWindowCloser.m		\
 	\
 	UIxFilterList.m			\
-	UIxSieveEditor.m		\
 	\
 	UIxMailFolderACLEditor.m
+# 	UIxSieveEditor.m
 
 MailerUI_RESOURCE_FILES += \
 	Version		\
diff --git a/UI/MailerUI/UIxMailTree.m b/UI/MailerUI/UIxMailTree.m
index 7a81e5d5..1cb06352 100644
--- a/UI/MailerUI/UIxMailTree.m
+++ b/UI/MailerUI/UIxMailTree.m
@@ -252,12 +252,12 @@ static BOOL debugBlocks = NO;
       *_ft = @"drafts";
       return;
     }
-    if ([ftype isEqualToString:@"IPF.Filter"]) {
-      *_t = [self labelForKey:@"SieveFolderName"];
-      *_icon = nil;
-      *_ft = @"sieve";
-      return;
-    }
+//     if ([ftype isEqualToString:@"IPF.Filter"]) {
+//       *_t = [self labelForKey:@"SieveFolderName"];
+//       *_icon = nil;
+//       *_ft = @"sieve";
+//       return;
+//     }
     break;
   }
 
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index cd3b540b..36638339 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -1,5 +1,5 @@
 { /* -*-cperl-*- */
-  requires = ( MAIN, CommonUI, Mailer, Sieve );
+  requires = ( MAIN, CommonUI, Mailer ); /* , Sieve */
 
   publicResources = (
     "uix.css",
@@ -385,12 +385,12 @@
 
     /* Sieve */
 
-    SOGoSieveScriptsFolder = {
+/*    SOGoSieveScriptsFolder = {
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = ( /* the toolbar groups */
-            ( /* first group */
+          value = (
+            (
               {
 	       link  = "getMail";
 	       image = "tb-mail-getmail-flat-24x24.png";
@@ -403,9 +403,9 @@
 	       cssClass = "tbicon_compose"; label = "New Filter";
               },
             ),
-            ( /* second group
+            (
               { link = "#";
-                cssClass = "tbicon_delete"; label = "Delete"; },*/
+                cssClass = "tbicon_delete"; label = "Delete"; },
             ),
           );
         };
@@ -427,9 +427,8 @@
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = ( /* the toolbar groups */
-            ( /* first group */
-              { link  = "#";
+          value = (
+            ( { link  = "#";
                 onclick  = "clickedEditorSave(this);return false;";
 		image = "tb-mail-file-flat-24x24.png";
 		cssClass = "tbicon_save"; label = "Save"; },
@@ -458,6 +457,6 @@
           actionName  = "delete";
         };
       };
-    };
+    }; */
   };
 }
-- 
2.39.5