Monotone-Parent: e433ae535cede58cecc04ea6e4733015deeea548

Monotone-Revision: 9c4692dfa023d79c22b1957404af85eb87b98350

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-16T20:48:52
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactEditor.m

@@ -560,13 +560,13 @@
       else
 	[address appendString: email];
 	
-      url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", address];
+      url = [NSString stringWithFormat: @"%@/Mail/compose?mailto=%@",
+		      [self userFolderPath], address];
     }
   else
-    url = @"Mail/compose";
-
-  return
-    [self redirectToLocation: [self relativePathToUserFolderSubPath: url]];
+    url = [NSString stringWithFormat: @"%@/Mail/compose", [self userFolderPath]];
+  
+  return [self redirectToLocation: url];
 }
 
 - (id) newAction

UI/WebServerResources/MailerUI.js

@@ -1173,7 +1173,7 @@ function openInbox(node) {
   mailboxTree.o(1);
 }
 
-function initMailer(event) { log ("initMailer");
+function initMailer(event) {
   if (!$(document.body).hasClassName("popup")) {
 //     initDnd();
     initMailboxTree();

UI/WebServerResources/generic.js

@@ -257,9 +257,10 @@ function openMailComposeWindow(url, wId) {
 
 function openMailTo(senderMailTo) {
   var mailto = sanitizeMailTo(senderMailTo);
+
   if (mailto.length > 0)
     openMailComposeWindow(ApplicationBaseURL
-			  + "/../Mail/compose?mailto=" + mailto);
+			  + "../Mail/compose?mailto=" + mailto);
 
   return false; /* stop following the link */
 }