From f8939bfb3efbb92957f237f998ff9f5fd5e72541 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 10 Mar 2014 10:07:47 -0400
Subject: [PATCH] Change the variable name for sieveFolderEncoding instead of
 folderEncoding

---
 SoObjects/SOGo/SOGoDefaults.plist              | 2 +-
 SoObjects/SOGo/SOGoSystemDefaults.h            | 2 +-
 SoObjects/SOGo/SOGoSystemDefaults.m            | 4 ++--
 UI/Templates/PreferencesUI/UIxFilterEditor.wox | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index a3f09d602..bdc5005f5 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -13,7 +13,7 @@
     SOGoZipPath = "/usr/bin/zip";
 
     SOGoEncryptionKey = "MySOGoEncryptionKey";
-    SOGoFolderEncoding = "UTF-7";
+    SOGoSieveFolderEncoding = "UTF-7";
 
     WOUseRelativeURLs = YES;
     WOMessageUseUTF8 = YES;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 24d7e4baf..953e799db 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -42,7 +42,7 @@
 - (BOOL) trustProxyAuthentication;
 - (NSString *) encryptionKey;
 - (BOOL) useRelativeURLs;
-- (NSString *) folderEncoding;
+- (NSString *) sieveFolderEncoding;
 
 - (BOOL) isWebAccessEnabled;
 - (BOOL) isCalendarDAVAccessEnabled;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 53e67e108..aa89c0c88 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -356,9 +356,9 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return [self boolForKey: @"WOUseRelativeURLs"];
 }
 
-- (NSString *) folderEncoding
+- (NSString *) sieveFolderEncoding
 {
-  return [self stringForKey: @"SOGoFolderEncoding"];
+  return [self stringForKey: @"SOGoSieveFolderEncoding"];
 }
 
 
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index 952188e47..b62f77a84 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -13,7 +13,7 @@
   >
   <script type="text/javascript">
     var filterId = '<var:string value="filterId"/>';
-    var folderEncoding = '<var:string value="folderEncoding"/>';
+    var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
     var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
   </script>
   <form id="mainForm" var:href="ownPath">