merge of '3f8608c82d9c379cc9e0fea6ffe853cc1949a24b'

and '7634b9d503d61b6240548e75e7f872081debc6b4'

Monotone-Parent: 3f8608c82d9c379cc9e0fea6ffe853cc1949a24b
Monotone-Parent: 7634b9d503d61b6240548e75e7f872081debc6b4
Monotone-Revision: a4c7e35d642045e63467a131fae8049524f450e4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-30T18:20:30
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoDefaults.plist

@@ -70,4 +70,6 @@
 
     SOGoReminderEnabled = YES;
     SOGoRemindWithASound = YES;
+
+    SOGoSearchMinimumWordLength = 2;
 }

SoObjects/SOGo/SOGoDomainDefaults.h

@@ -77,6 +77,8 @@
 
 - (BOOL) hideSystemEMail;
 
+- (int) searchMinimumWordLength;
+
 @end
 
 #endif /* SOGODOMAINDEFAULTS_H */

SoObjects/SOGo/SOGoDomainDefaults.m

@@ -319,4 +319,9 @@
   return [self boolForKey: @"SOGoHideSystemEMail"];
 }
 
+- (int) searchMinimumWordLength
+{
+  return [self integerForKey: @"SOGoSearchMinimumWordLength"];
+}
+
 @end