From 9874fa469c33e5259131a8c13c05e1f6749a93ff Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 5 Sep 2012 20:06:22 +0000
Subject: [PATCH] Monotone-Parent: 5256e25412e03d77d707a92d0bcfda4e03f05d98
 Monotone-Revision: d37b05310d38d5954711085cdeecbc2ffc7e8d82

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-09-05T20:06:22
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                | 6 ++++++
 OpenChange/MAPIStoreCalendarAttachment.m | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b2bbc2e29..966c12941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreCalendarAttachment.m
+	(-getPidTagDisplayName:inMemCtx:): return an allocated value,
+	since returned values must be assigned to another parent.
+
 2012-08-28  Jean Raby  <jraby@inverse.ca>
 
 	* Scripts/openchange_cleanup.py:
diff --git a/OpenChange/MAPIStoreCalendarAttachment.m b/OpenChange/MAPIStoreCalendarAttachment.m
index cbe63c6d7..e4307f1f3 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.m
+++ b/OpenChange/MAPIStoreCalendarAttachment.m
@@ -124,7 +124,7 @@
 - (int) getPidTagDisplayName: (void **) data
                     inMemCtx: (TALLOC_CTX *) localMemCtx
 {
-  *data = "Untitled";
+  *data = [@"Untitled" asUnicodeInMemCtx: localMemCtx];
 
   return MAPISTORE_SUCCESS;
 }