From b6bd0c44975ef5741ddc96194d4d287b59f77697 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 8 Jul 2011 01:34:36 +0000
Subject: [PATCH] Cleanup of unused variables.

Monotone-Parent: 7f72bf38468755bb297376dd8f4ea909be348709
Monotone-Revision: 8c19f19f3be5a4b6fb34ceeaab91ee58b54610d1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-08T01:34:36
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Mailer/SOGoDraftObject.m  |  6 ------
 SoObjects/Mailer/SOGoDraftsFolder.m |  3 +--
 SoObjects/Mailer/SOGoMailAccount.m  | 14 +++-----------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index b2804c824..1d11305b7 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -981,9 +981,6 @@ static NSString    *userAgent      = nil;
   */
   NGMutableHashMap *map;
   NGMimeBodyPart   *bodyPart;
-  SOGoUserDefaults *ud;
-
-  ud = [[context activeUser] userDefaults];
   
   /* prepare header of body part */
 
@@ -1014,12 +1011,9 @@ static NSString    *userAgent      = nil;
 - (NGMimeMessage *) mimeMessageForContentWithHeaderMap: (NGMutableHashMap *) map
 {
   NGMimeMessage *message;  
-  SOGoUserDefaults *ud;
 //   BOOL     addSuffix;
   id       body;
 
-  ud = [[context activeUser] userDefaults];
-
   [map setObject: @"text/plain" forKey: @"content-type"];
   body = text;
   if (body)
diff --git a/SoObjects/Mailer/SOGoDraftsFolder.m b/SoObjects/Mailer/SOGoDraftsFolder.m
index 140f4605e..fa43f6960 100644
--- a/SoObjects/Mailer/SOGoDraftsFolder.m
+++ b/SoObjects/Mailer/SOGoDraftsFolder.m
@@ -37,7 +37,7 @@ static unsigned int newCount;
 
 - (NSString *) generateNameForNewDraft
 {
-  NSString *newName, *login;
+  NSString *newName;
   unsigned int currentTime;
 
   currentTime = [[NSDate date] timeIntervalSince1970];
@@ -49,7 +49,6 @@ static unsigned int newCount;
       newCount = 1;
     }
 
-  login = [[context activeUser] login];
   newName = [NSString stringWithFormat: @"newDraft%u-%u",
 		      currentTime, newCount];
 
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 1e795f74f..e733e3953 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -121,13 +121,6 @@ static NSString *inboxFolderName = @"INBOX";
   NSArray *namespace;
   NGImap4Client *client;
 
-  SOGoUser *user;
-  NSArray *accounts;
-  NSDictionary *account;
-
-  user = [SOGoUser userWithLogin: [self ownerInContext: nil]];
-  accounts = [user mailAccounts];
-  account = [accounts objectAtIndex: [nameInContainer intValue]];
   client = [[self imap4Connection] client];
   namespaceDict = [client namespace];
 
@@ -285,10 +278,9 @@ static NSString *inboxFolderName = @"INBOX";
   manager = [SOGoSieveManager sieveManagerForUser: [context activeUser]];
 
   return [manager updateFiltersForLogin: [[self imap4URL] user]
-		  authname: [[self imap4URL] user]
-		  password: [self imap4PasswordRenewed: NO]
-		  account: self];
- 
+                               authname: [[self imap4URL] user]
+                               password: [self imap4PasswordRenewed: NO]
+                                account: self];
 }