From e74e4d243a6771c01228e0948fd55277172e89f6 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 30 Mar 2007 14:34:10 +0000
Subject: [PATCH] Monotone-Parent: 5ed8893c9ab3c60ce85c27df45014ec4a47897e6
 Monotone-Revision: e0611ca83ac30e5f04e33422e44b877e6ddd058c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-03-30T14:34:10
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  | 6 ++++++
 UI/MailPartViewers/UIxMailPartHTMLViewer.m | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4091f7b80..b7333eed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	([UIxMailPartHTMLViewer -_attachmentIds]): take the current
+	attachment path into account when computing the part urls.
+
 2007-03-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactsListViewContainer.m
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 5203d85e5..3fd047fe7 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -397,6 +397,7 @@
   NSMutableDictionary *attachmentIds;
   UIxMailPartViewer *parent;
   unsigned int count, max;
+  NSMutableString *url;
   NSString *baseURL;
   NSArray *parts;
 
@@ -408,16 +409,20 @@
                          isEqualToString: @"UIxMailPartAlternativeViewer"])
     {
       baseURL = [[self clientObject] baseURLInContext: context];
+      url = [NSMutableString new];
+      [url appendString: baseURL];
+      [url appendFormat: @"/%@", [partPath componentsJoinedByString: @"/"]];
+      [url deleteCharactersInRange: NSMakeRange([url length] - 3, 2)];
       parts = [[parent bodyInfo] objectForKey: @"parts"];
       max = [parts count];
       for (count = 0; count < max; count++)
         [self _convertReferencesForPart: [parts objectAtIndex: count]
               withCount: count + 1
-              andBaseURL: baseURL
+              andBaseURL: url
               intoDictionary: attachmentIds];
+      [url release];
     }
 
-  NSLog(@"attc: '%@'", attachmentIds);
   return attachmentIds;
 }