From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 18 Jul 2005 09:00:23 +0000 (+0000)
Subject: emailForUser -> [activeUser email]
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0867a1fdeb0182566ec0ed364ce4b91655d075b;p=scalable-opengroupware.org

emailForUser -> [activeUser email]

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@782 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index f533e852..6b97920e 100644
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+        * UIxMailEditor.m: removed -emailForUser usage and replaced with
+          'official' activeUser API (v0.9.142)
+
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
 	* product.plist: only enable folder add/remove buttons when the user
diff --git a/SOGo/UI/MailerUI/UIxMailEditor.m b/SOGo/UI/MailerUI/UIxMailEditor.m
index 449744cb..33272222 100644
--- a/SOGo/UI/MailerUI/UIxMailEditor.m
+++ b/SOGo/UI/MailerUI/UIxMailEditor.m
@@ -48,14 +48,11 @@
 #include <SoObjects/Mailer/SOGoMailFolder.h>
 #include <SoObjects/Mailer/SOGoMailAccount.h>
 #include <SoObjects/SOGo/WOContext+Agenor.h>
+#include <SoObjects/SOGo/SOGoUser.h>
 #include <NGMail/NGMimeMessage.h>
 #include <NGMail/NGMimeMessageGenerator.h>
 #include "common.h"
 
-@interface UIxComponent (Scheduler_Privates)
-- (NSString *)emailForUser;
-@end
-
 @implementation UIxMailEditor
 
 static BOOL         keepMailTmpFile    = NO;
@@ -123,7 +120,7 @@ static NSArray      *infoKeys = nil;
 }
 - (NSString *)from {
   if (![self->from isNotNull])
-    return [self emailForUser];
+    return [[[self context] activeUser] email];
   return self->from;
 }
 
@@ -186,7 +183,7 @@ static NSArray      *infoKeys = nil;
     return self->fromEMails;
   
   uid     = [[self user] login];
-  primary = [self emailForUser];
+  primary = [[[self context] activeUser] email];
   if (![[self context] isAccessFromIntranet]) {
     self->fromEMails = [[NSArray alloc] initWithObjects:&primary count:1];
     return self->fromEMails;
diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index ccd9c65e..af05addd 100644
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=141
+SUBMINOR_VERSION:=142
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41