merge of '776dc75fed5683da1627715f48714600978e0286'

and 'a9979a68cce7a82e5b6ee0e52a65df546ab56c59'

Monotone-Parent: 776dc75fed5683da1627715f48714600978e0286
Monotone-Parent: a9979a68cce7a82e5b6ee0e52a65df546ab56c59
Monotone-Revision: bc53d4486da9eb6b195273cef7d073fdcf53aa5c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-24T21:39:01
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,12 @@
+2010-02-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* Added a patch from Adam Yearout <ayearout@royal.wednet.edu>
+	to fix OpenSUSE compilation issues.
+
+	* Added a patch from dev@ib.pl to make the memcached port
+	being used by SOGo configurable using the SOGoMemcachedPort
+	default option.
+
 2010-02-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m

SoObjects/SOGo/GNUmakefile.preamble

@@ -12,6 +12,7 @@ ADDITIONAL_CPPFLAGS += \
 SOGo_LIBRARIES_DEPEND_UPON += \
 	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
+	-lmemcached		\
 	-lOGoContentStore	\
 	-lGDLAccess		\
 	-lNGObjWeb		\

SoObjects/SOGo/SOGoCache.h

@@ -42,6 +42,7 @@
   NSMutableDictionary *cache;
   NSMutableDictionary *users;
   float cleanupInterval;
+  int memcachedServerPort;
   NSString *memcachedServerName;
   // @private
   //   memcached_server_st *servers;

SoObjects/SOGo/SOGoCache.m

@@ -105,26 +105,24 @@ static memcached_st *handle = NULL;
           handle = memcached_create(NULL);
           if (handle)
             {
-#warning We could also make the port number configurable and even make use \
-  of NGNetUtilities for that.
-
               sd = [SOGoSystemDefaults sharedSystemDefaults];
               // We define the default value for cleaning up cached users'
               // preferences. This value should be relatively high to avoid
               // useless database calls.
 
               cleanupInterval = [sd cacheCleanupInterval];
+              memcachedServerPort = [sd memcachedPort];
               ASSIGN (memcachedServerName, [sd memcachedHost]);
 
               [self logWithFormat: @"Cache cleanup interval set every %f seconds",
                     cleanupInterval];
-              [self logWithFormat: @"Using host '%@' as server",
+              [self logWithFormat: @"Using host '%@':%i as server",
-                    memcachedServerName];
+                    memcachedServerName, memcachedServerPort];
               if (!servers)
                 servers
                   = memcached_server_list_append(NULL,
                                                  [memcachedServerName UTF8String],
-                                                 11211, &error);
+                                                 memcachedServerPort, &error);
               error = memcached_server_push(handle, servers);
             }
         }

SoObjects/SOGo/SOGoDefaults.plist

@@ -13,6 +13,7 @@
 
     SOGoCacheCleanupInterval = 300.0;
     SOGoMemcachedHost = "localhost";
+    SOGoMemcachedPort = 11211;
 
     SOGoUIxDebugEnabled = NO;
 

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -51,6 +51,7 @@
 
 - (NSTimeInterval) cacheCleanupInterval;
 - (NSString *) memcachedHost;
+- (int) memcachedPort;
 
 - (BOOL) userCanChangePassword;
 - (BOOL) uixAdditionalPreferences;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -260,6 +260,11 @@ BootstrapNSUserDefaults ()
   return [self stringForKey: @"SOGoMemcachedHost"];
 }
 
+- (int) memcachedPort
+{
+  return [self integerForKey: @"SOGoMemcachedPort"];
+}
+
 - (BOOL) uixDebugEnabled
 {
   return [self boolForKey: @"SOGoUIxDebugEnabled"];

UI/Scheduler/UIxCalListingActions.m

@@ -317,7 +317,7 @@ static NSArray *tasksFields = nil;
   SOGoAppointmentFolders *clientObject;
   SOGoUser *ownerUser;
   NSString *owner, *role;
-  BOOL isErasable, *folderIsRemote;
+  BOOL isErasable, folderIsRemote;
 
   infos = [NSMutableArray array];
   marker = [NSNull null];