Branch '2.3-stable' - kolab-webclient/dimp release-notes.txt

[Gunnar Wrobel]

 kolab-webclient/dimp/ChangeLog                         |    6 ++++
 kolab-webclient/dimp/dimp.spec                         |    2 -
 kolab-webclient/dimp/patches/dimp-1.1.6/issue4743.diff |   23 +++++++++++++++++
 kolab-webclient/dimp/patches/dimp-1.1.6/series         |    3 +-
 release-notes.txt                                      |    4 ++
 5 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 89866120a13b442e1f08629d8b551ce055fcac3a
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Aug 31 07:53:36 2011 +0000

    kolab/issue4743 ([DIMP] [v2.3.2] Mail blank in frame but displays fine in new window)

diff --git a/kolab-webclient/dimp/ChangeLog b/kolab-webclient/dimp/ChangeLog
index 1262e62..bf1d4d0 100644
--- a/kolab-webclient/dimp/ChangeLog
+++ b/kolab-webclient/dimp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-31  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/dimp-1.1.6/issue4743.diff:
+
+	kolab/issue4743 ([DIMP] [v2.3.2] Mail blank in frame but displays fine in new window)
+
 2010-11-26  Gunnar Wrobel  <p at rdus.de>
 
 	* dimp.spec: Update to 1.1.6.
diff --git a/kolab-webclient/dimp/dimp.spec b/kolab-webclient/dimp/dimp.spec
index 57e2bd3..06dc241 100644
--- a/kolab-webclient/dimp/dimp.spec
+++ b/kolab-webclient/dimp/dimp.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package dimp
 %define         V_version 1.1.6
-%define         V_release 20101126
+%define         V_release 20110831
 
 # Package Information
 Name:		%{V_package}
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/issue4743.diff b/kolab-webclient/dimp/patches/dimp-1.1.6/issue4743.diff
new file mode 100644
index 0000000..5fa2462
--- /dev/null
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/issue4743.diff
@@ -0,0 +1,23 @@
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] issue4743
+
+kolab/issue4743 ([DIMP] [v2.3.2] Mail blank in frame but displays fine in new window)
+
+STATUS: HACK
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+diff --git a/imp.php b/imp.php
+index f8b9b5c..70264fe 100644
+--- a/imp.php
++++ b/imp.php
+@@ -509,6 +509,9 @@
+     require_once DIMP_BASE . '/lib/Views/ShowMessage.php';
+     $show_msg = new DIMP_Views_ShowMessage();
+     $result = (object) $show_msg->showMessage($args);
++    if (String::upper(NLS::getCharset()) != 'UTF-8') {
++      $result->msgtext = 'Your server is unable to render UTF-8 message. The preview won\'t work. Please contact your administrator.';
++    }
+     break;
+
+ case 'Html2Text':
diff --git a/kolab-webclient/dimp/patches/dimp-1.1.6/series b/kolab-webclient/dimp/patches/dimp-1.1.6/series
index ecb3f6d..886527b 100644
--- a/kolab-webclient/dimp/patches/dimp-1.1.6/series
+++ b/kolab-webclient/dimp/patches/dimp-1.1.6/series
@@ -3,4 +3,5 @@ t_dimp_H_BL_CloseContextMenu.diff
 t_dimp_H_GW_AclView.diff
 t_dimp_H_GW_FoldersView.diff
 t_dimp_HK_GW_ItipHandling.diff
-t_dimp_H_MS_CopyMessagesWithCtrl.diff
\ No newline at end of file
+t_dimp_H_MS_CopyMessagesWithCtrl.diff
+issue4743.diff
diff --git a/release-notes.txt b/release-notes.txt
index f4ebf7e..29225fa 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -8,6 +8,10 @@ the 1st.README file in the package directory.
 
  Changes between 2.3.2 and 2.3-?:
 
+    - dimp-1.1.6-20110831
+
+	kolab/issue4743 ([DIMP] [v2.3.2] Mail blank in frame but displays fine in new window)
+
     - horde-3.3.11-20110824
 
 	kolab/issue4739 (Webmail problems with attachments in kolab-2.3.1)