New button "Add default email addresses" for the vacation tab of the preferences window.

Monotone-Parent: 47f2f8615e2de608097b0eb96881d051d4b7e9a6
Monotone-Revision: 565a1bad1f0abc7187afc4117f947fa311875346

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-14T22:11:13
Monotone-Branch: ca.inverse.sogo

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -21,6 +21,7 @@
 "Enable vacation auto reply" = "Enable vacation auto reply";
 "Auto reply message :" = "Auto reply message :";
 "Email addresses (separated by commas) :" = "Email addresses (separated by commas) :";
+"Add default email addresses" = "Add default email addresses";
 "Days between responses :" = "Days between responses :";
 "Do not send responses to mailing lists" = "Do not send responses to mailing lists";
 "Please specify your message and your email addresses for which you want to enable auto reply."

UI/PreferencesUI/French.lproj/Localizable.strings

@@ -20,6 +20,7 @@
 "Enable vacation auto reply" = "Enable vacation auto reply";
 "Auto reply message :" = "Auto reply message :";
 "Email addresses (separated by commas) :" = "Email addresses (separated by commas) :";
+"Add default email addresses" = "Ajouter les adresses par défaut";
 "Days between responses :" = "Days between responses :";
 "Do not send responses to mailing lists" = "Do not send responses to mailing lists";
 "Please specify your message and your email addresses for which you want to enable auto reply."

UI/PreferencesUI/UIxPreferences.m

@@ -742,28 +742,33 @@ static BOOL forwardEnabled = NO;
 		      forKey: @"autoReplyEmailAddresses"];
 }
 
-- (NSString *) autoReplyEmailAddresses
+- (NSString *) defaultEmailAddresses
 {
   NSArray *addressesList;
-  NSMutableArray *newAddressesList;
+  NSMutableArray *uniqueAddressesList;
   NSString *address;
   unsigned int i;
 
-  addressesList = [vacationOptions objectForKey: @"autoReplyEmailAddresses"];
-  if (!addressesList)
+  uniqueAddressesList = [NSMutableArray array];
+  addressesList = [NSMutableArray arrayWithArray: [user allEmails]];
+   for (i = 0; i < [addressesList count]; i++)
     {
-      newAddressesList = [NSMutableArray array];
-      addressesList = [NSMutableArray arrayWithArray: [user allEmails]];
-      for (i = 0; i < [addressesList count]; i++)
-	{
-	  address = [addressesList objectAtIndex: i];
-	  if (![newAddressesList containsObject: address])
-	    [newAddressesList addObject: address];
-	}
-      addressesList = newAddressesList;
+      address = [addressesList objectAtIndex: i];
+      if (![uniqueAddressesList containsObject: address])
+	[uniqueAddressesList addObject: address];
     }
 
-  return [addressesList componentsJoinedByString: @", "];
+  return [uniqueAddressesList componentsJoinedByString: @", "];
+}
+
+- (NSString *) autoReplyEmailAddresses
+{
+  NSArray *addressesList;
+ 
+  addressesList = [vacationOptions objectForKey: @"autoReplyEmailAddresses"];
+
+  return (addressesList?
+	  [addressesList componentsJoinedByString: @", "] : [self defaultEmailAddresses]);
 }
 
 - (NSArray *) daysBetweenResponsesList