git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1018 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 3d056c5598135cbe1cdd821220d2422e0b67ba8d..2b5cfc959bd47eeb8bbca6cbb22ad67d3dd4d3b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * SoObjects/SOGo/NSArray+Utilities.m: added an implementation of
+       makeObjectsPerform:withObject:withObject: for GNUstep
+       compatibility.
+       
+       * OGoContentStore/GNUmakefile, Protocols/common.make,
+       SoObjects/common.make, UI/common.make: install in
+       GNUSTEP_INSTALLATION_DIR instead of GNUSTEP_USER_DIR.
+
+2007-02-07  Ludovic Marcotte <ludovic@inverse.ca>
+
+       * UI/Scheduler/English.lproj/Localizable.strings
+         Fixed typo for "Agendas" 
+
+
 2007-02-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/MailerUI/UIxMailTree.m ([UIxMailTree

diff --git a/Main/sogod.m b/Main/sogod.m
index ab5c895f7df12438e87175fdd3702952bb2c9a44..308b2fc09caa87bb9fa52ccb825d6dddd215fbae 100644 (file)
--- a/Main/sogod.m
+++ b/Main/sogod.m
@@ -31,7 +31,7 @@ int main(int argc, char **argv, char **env)
   NSUserDefaults *ud;
   NSAutoreleasePool *pool;
 
-  pool = [[NSAutoreleasePool alloc] init];
+  pool = [NSAutoreleasePool new];
 #if LIB_FOUNDATION_LIBRARY
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif

diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index 5807b690d3e488dc1a0bc3c4949d32290e78f5f1..d8a20b4f9cdaa77d3c0bedd519034853997d2e3a 100644 (file)
--- a/OGoContentStore/GNUmakefile
+++ b/OGoContentStore/GNUmakefile
@@ -7,7 +7,7 @@ include ./Version
 LIBRARY_NAME = libOGoContentStore
 TOOL_NAME    = test_quick_extract
 
-TYPEMODELS_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/OCSTypeModels/
+TYPEMODELS_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/OCSTypeModels/
 
 libOGoContentStore_HEADER_FILES_DIR         = .
 libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore

diff --git a/Protocols/common.make b/Protocols/common.make
index 8d43914d605705427c485ff4f94e1102b93bb695..03483a6d1287eb41240bbc2a0dd4d8a2bdf43129 100644 (file)
--- a/Protocols/common.make
+++ b/Protocols/common.make
@@ -6,7 +6,7 @@ include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..            \

diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index 4e85a8e434b2a11f9597bf6cabf9586261dd0686..cf4c489ae1008aaa2c436c8345f82417fa32de95 100644 (file)
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -22,6 +22,7 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSRange.h>
 #import <Foundation/NSString.h>
 
 #import "NSArray+NGCards.h"
@@ -300,7 +301,8 @@
 
 - (NSString *) namedValue: (NSString *) aValueName
 {
-  unsigned int index, equalSign;
+  unsigned int index;
+  NSRange equalSign;
   NSString *value;
 
   index = [self _namedValue: aValueName];
@@ -309,9 +311,9 @@
   else
     {
       value = [values objectAtIndex: index];
-      equalSign = [value indexOfString: @"="];
-      if (equalSign != NSNotFound)
-        value = [value substringFromIndex: equalSign + 1];
+      equalSign = [value rangeOfString: @"="];
+      if (equalSign.location != NSNotFound)
+        value = [value substringFromIndex: equalSign.location + 1];
     }
 
   return value;

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 2d156fe27cab9df251d9ffd613bf60f7dc16a201..5dc47b5ebc7dbd4196f895f2bb1195f9e8da80af 100644 (file)
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * CardElement.m ([CardElement -namedValue:aValueName]): use
+       NSString's rangeOfString instead of indexOfString for
+       compatibility with GNUstep.
+
 2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * NGVCard.m ([NGVCard -classForTag:classTag]): declare an entry

diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index 768009d271e887ff6024d765c92f3b3932c7caf5..eb0c4e421e446fc248f3a57efc8626fcb485538c 100644 (file)
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSRange.h>
 #import <Foundation/NSTimeZone.h>
 #import <NGExtensions/NSObject+Logs.h>

diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m
index 4292d37bbba7f3aa0f77a7657edc7bd1112c3109..9842dd45534197a61d9eb13083dda89c641276df 100644 (file)
--- a/SOPE/NGCards/iCalRecurrenceRule.m
+++ b/SOPE/NGCards/iCalRecurrenceRule.m
@@ -19,6 +19,8 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
 #import <NGExtensions/NSString+Ext.h>
 #import <NGExtensions/NSObject+Logs.h>

diff --git a/SOPE/NGCards/iCalTimeZone.m b/SOPE/NGCards/iCalTimeZone.m
index 51bd372983d3ab711068dc3c6133eb54be6e6a49..1de139fb68e1ebe54c4a02785e1ee9f6dc92b91a 100644 (file)
--- a/SOPE/NGCards/iCalTimeZone.m
+++ b/SOPE/NGCards/iCalTimeZone.m
@@ -21,8 +21,9 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 
 #import "NSCalendarDate+NGCards.h"
 #import "NSString+NGCards.h"

diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m
index 03d6cb4b3bee97110349154d9f3d173416d261cf..d157720b6481e9d32d40faa0c4822570ce7f6ac2 100644 (file)
--- a/SOPE/NGCards/iCalTimeZonePeriod.m
+++ b/SOPE/NGCards/iCalTimeZonePeriod.m
@@ -22,6 +22,7 @@
 
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 
 #import "iCalDateTime.h"
 #import "iCalRecurrenceRule.h"

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 9cbda1823f1de8ecf70a751aefe0f583fab98d5a..a85e2900af8a5338afd0f6dbc06ba06e8d0b5149 100644 (file)
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -70,15 +70,15 @@ static NSNumber   *sharedYes = nil;
   lm      = [NGLoggerManager defaultLoggerManager];
   logger  = [lm loggerForDefaultKey:@"SOGoAppointmentFolderDebugEnabled"];
 
-  securityInfo = [self soClassSecurityInfo];
-  [securityInfo declareRole: SOGoRole_Delegate
-                asDefaultForPermission: SoPerm_AddDocumentsImagesAndFiles];
-  [securityInfo declareRole: SOGoRole_Delegate
-                asDefaultForPermission: SoPerm_ChangeImagesAndFiles];
-  [securityInfo declareRoles: [NSArray arrayWithObjects:
-                                         SOGoRole_Delegate,
-                                       SOGoRole_Assistant, nil]
-                asDefaultForPermission: SoPerm_View];
+//   securityInfo = [self soClassSecurityInfo];
+//   [securityInfo declareRole: SOGoRole_Delegate
+//                 asDefaultForPermission: SoPerm_AddDocumentsImagesAndFiles];
+//   [securityInfo declareRole: SOGoRole_Delegate
+//                 asDefaultForPermission: SoPerm_ChangeImagesAndFiles];
+//   [securityInfo declareRoles: [NSArray arrayWithObjects:
+//                                          SOGoRole_Delegate,
+//                                        SOGoRole_Assistant, nil]
+//                 asDefaultForPermission: SoPerm_View];
 
   sharedYes = [[NSNumber numberWithBool:YES] retain];
 }

diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index 8e22aec1a8bcb83e1da7cf4b03c9b060f8e9b2c4..e9856d9048f4278328782e09a634ef847dc91e73 100644 (file)
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -11,6 +11,7 @@
     SOGoAppointmentFolder = {
       superclass    = "SOGoFolder";
       defaultRoles = {
+        "View" = ( "Owner", "Delegate", "Assistant" );
         "FreeBusyLookup" = ( "Owner", "Delegate", "Assistant", "FreeBusy" );
       };
     };

diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index fd20c995895c2546958562b21abc2ef45d882d83..0a7155d9b7901c7c255f89bb17c323040fa88589 100644 (file)
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -13,7 +13,7 @@ endif
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 libSOGo_LIB_DIRS +=                            \
-       -L$(RELBUILD_DIR_libOGoContentStore)
+       -L$(RELBUILD_DIR_libOGoContentStore) -L$(RELBUILD_DIR_libOGoContentStore)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)
 
 libSOGo_LIBRARIES_DEPEND_UPON += \
        -lOGoContentStore       \
@@ -26,6 +26,8 @@ libSOGo_LIBRARIES_DEPEND_UPON += \
        -lNGLdap
 
 ADDITIONAL_TOOL_LIBS += \
+        -L$(GNUSTEP_OBJ_DIR)/ \
+        $(libSOGO_LIB_DIRS) \
        -lGDLContentStore -lGDLAccess   \
        -lNGLdap                        \
        -lNGExtensions -lEOControl      \

diff --git a/SoObjects/SOGo/NSArray+Utilities.h b/SoObjects/SOGo/NSArray+Utilities.h
index bd026f4c389bd4878a3ff444073b0c10798816fc..15cbb174be29e4f16fdfee6c874685febb9fe981 100644 (file)
--- a/SoObjects/SOGo/NSArray+Utilities.h
+++ b/SoObjects/SOGo/NSArray+Utilities.h
@@ -31,6 +31,12 @@
 
 - (NSArray *) stringsWithFormat: (NSString *) format;
 
+#ifdef GNUSTEP_BASE_LIBRARY
+- (void) makeObjectsPerform: (SEL) selector
+                 withObject: (id) object1
+                 withObject: (id) object2;
+#endif
+
 @end
 
 #endif /* NSARRAY_UTILITIES_H */

diff --git a/SoObjects/SOGo/NSArray+Utilities.m b/SoObjects/SOGo/NSArray+Utilities.m
index 6949db3bd46114552e27cde7038a43f8a7c45624..ed30b5e5af473c700dfa5d032661d66839ac4728 100644 (file)
--- a/SoObjects/SOGo/NSArray+Utilities.m
+++ b/SoObjects/SOGo/NSArray+Utilities.m
@@ -45,4 +45,17 @@
   return formattedStrings;
 }
 
+- (void) makeObjectsPerform: (SEL) selector
+                 withObject: (id) object1
+                 withObject: (id) object2
+{
+  int count, max;
+
+  max = [self count];
+  for (count = 0; count < max; count++)
+    [[self objectAtIndex: count] performSelector: selector
+                                 withObject: object1
+                                 withObject: object2];
+}
+
 @end

diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 03609d0c536588aa936deb060c79a7505dbeb8b7..77c4e4584cfac155e426a2df603600cadb481192 100644 (file)
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSEnumerator.h>
+
 #import "NSString+Utilities.h"
 #import "NSDictionary+URL.h"
 

diff --git a/SoObjects/common.make b/SoObjects/common.make
index fbedc51765a3d65b6d8217327960a818f0fb6323..064352a90314b090fc6d0524a2739ed9a86d254e 100644 (file)
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -6,7 +6,7 @@ include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION     = .SOGo
-BUNDLE_INSTALL_DIR   = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR   = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
 WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
 
@@ -20,6 +20,7 @@ ADDITIONAL_LIB_DIRS += \
         -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
        -L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
        -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
+       -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
         -L/usr/local/lib
 
 BUNDLE_LIBS += \

diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 8f237d5695da5def12e7c4ffd36c2ec0becb3610..95e560d96994b6844a0a8539504df9ba08bd1bc3 100644 (file)
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "Preferred" = "Preferred";
 "Card for %@" = "Card for %@";
 "Display Name: " = "Display Name: ";
-"Email Address: " = "Email Address: "
+"Email Address: " = "Email Address: ";
 
 "Firstname: " = "Firstname: ";
 "Lastname: " = "Lastname: ";

diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index c9063d6e814263974a194b3fc7c5f9532ba501b0..a90cdf1b41c7b37b0b9eea49f78dece424b0e8d6 100644 (file)
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -19,7 +19,8 @@
   02111-1307, USA.
 */
 
-#import <SoObjects/Mailer/SOGoMailObject.h>
+#import <Mailer/SOGoMailObject.h>
+#import <SOGo/NSString+Utilities.h>
 #import <SOGoUI/UIxComponent.h>
 #import "UIxMailMainFrame.h"
 

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index b0a25c0ff32647cd041f247ceb3affc15534ceee..d9170d8abb1d5db67054d12a8093ba70023005a7 100644 (file)
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -66,7 +66,7 @@
 
 /* Menu */
 
-"Calendars"            = "Agendas";
+"Calendars"            = "Calendars";
 "Calendar"             = "Calendar";
 "Contacts"             = "Contacts";
 

diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 6f24256c0b3faaa237b9ac1b0f25aaf84eeae2e4..6c797a613ab3f0c40c1a61e57b84a4a8741f0f08 100644 (file)
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -27,7 +27,7 @@
 "Week"          = "Semaine";
 "this week"     = "cette semaine";
 
-"Week %d" = "Semaine nº %d";
+"Week %d" = "Semaine nú %d";
 
 /* Month */
 

diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m
index f6d2ae33617c2647355b9c69320556f496430f4b..1f46861c34a9346633aa4883790a6ba4ae84f100 100644 (file)
--- a/UI/Scheduler/UIxCalInlineAptView.m
+++ b/UI/Scheduler/UIxCalInlineAptView.m
@@ -20,6 +20,8 @@
  */
 // $Id$
 
+#import <math.h>
+
 #import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/NGObjWeb.h>

diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index 48fda46f7cfac5e04cb14d0e678b8e4830e19f59..ea5fedf0d8c66874cf719372a082ace9f3f6e212 100644 (file)
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -12,6 +12,7 @@
 #import "UIxComponent+Agenor.h"
 
 #import "SoObjects/Appointments/SOGoAppointmentFolder.h"
+#import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoObject.h>
 

diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 9a904ec0a3ae7ecc05c9abc9835b750101dc6b07..c6357450f106f8935b8bad05b700e8b4a445a255 100644 (file)
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -6,7 +6,6 @@
     xmlns:label="OGo:label"
     className="UIxPageFrame"
     title="title"
-    popup="isPopup"
     >
     <div class="menu" id="monthListMenu">
       <ul>

diff --git a/UI/common.make b/UI/common.make
index 0481cca4c394b527a14a6b44df210f6ad985b5ea..1efe9382778e9468bf2495a95a4bca0e062077eb 100644 (file)
--- a/UI/common.make
+++ b/UI/common.make
@@ -6,7 +6,7 @@ include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..            \