Change the variable name for sieveFolderEncoding instead of folderEncoding

SoObjects/SOGo/SOGoDefaults.plist

@@ -13,7 +13,7 @@
     SOGoZipPath = "/usr/bin/zip";
 
     SOGoEncryptionKey = "MySOGoEncryptionKey";
-    SOGoFolderEncoding = "UTF-7";
+    SOGoSieveFolderEncoding = "UTF-7";
 
     WOUseRelativeURLs = YES;
     WOMessageUseUTF8 = YES;

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -42,7 +42,7 @@
 - (BOOL) trustProxyAuthentication;
 - (NSString *) encryptionKey;
 - (BOOL) useRelativeURLs;
-- (NSString *) folderEncoding;
+- (NSString *) sieveFolderEncoding;
 
 - (BOOL) isWebAccessEnabled;
 - (BOOL) isCalendarDAVAccessEnabled;

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"];
 }
 
 

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">