merge of '87cdbdef6d83dbc434c03ced31452112ebb2df51'

and 'b92151d1bc5fc823aae0b28dda5a96bed55e476a'

Monotone-Parent: 87cdbdef6d83dbc434c03ced31452112ebb2df51
Monotone-Parent: b92151d1bc5fc823aae0b28dda5a96bed55e476a
Monotone-Revision: d7aebce05726f8e7de4e1e755b2143939a487c9e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-01-05T19:05:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-01-05 19:05:32 +00:00
2 changed files with 8 additions and 3 deletions
+7
View File
@@ -3,6 +3,13 @@
* UI/WebServerResources/generic.js (showConfirmDialog): buttons
callbacks must be updated when retrieving dialog box from cache.
2011-01-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreContactsMessageTable.m
(-getChildProperty:forKey:withTag:): result the same value for
"PR_SUBJECT" as for "PR_DISPLAY_NAME_UNICODE" instead of a stub
string.
2010-12-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailMessageTable.m
+1 -3
View File
@@ -118,9 +118,6 @@
// case PR_EMS_AB_DXA_REMOTE_CLIENT_UNICODE: "Home:" ???
// *data = talloc_strdup (memCtx, "PR_EMS...");
// break;
case PR_SUBJECT_UNICODE:
*data = talloc_strdup (memCtx, "PR_SUBJECT...");
break;
case PR_OAB_NAME_UNICODE:
*data = talloc_strdup (memCtx, "PR_OAB_NAME_UNICODE");
break;
@@ -143,6 +140,7 @@
*data = [stringValue asUnicodeInMemCtx: memCtx];
break;
case PR_SUBJECT_UNICODE:
case PR_DISPLAY_NAME_UNICODE: // Full Name
case PidLidFileUnder: // contact block title name
rc = [super getChildProperty: data