summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff')
-rw-r--r--media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff68
1 files changed, 0 insertions, 68 deletions
diff --git a/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff b/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff
deleted file mode 100644
index e7a7e05b7327..000000000000
--- a/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-http://toms-cafe.de/vdr/download/mailbox-0.4.0-1.5.3.diff
-
---- mailbox-0.4.0/AxMailWrapper.cpp
-+++ mailbox-0.4.0/AxMailWrapper.cpp
-@@ -578,7 +578,11 @@ AxMailWrapper::LineCltn AxMailWrapper::g
-
- //----- convert to OSD-CharSet -----
- Ax::Mail::Tools::map2CharSet( aStr, thePart->getParam("charset")
-+#if APIVERSNUM >= 10503
-+ , aStr, cCharSetConv::SystemCharacterTable()
-+#else
- , aStr, I18nCharSets()[Setup.OSDLanguage]
-+#endif
- );
-
- //----- do formatting---------------
---- mailbox-0.4.0/AxMenuMailListView.cpp
-+++ mailbox-0.4.0/AxMenuMailListView.cpp
-@@ -149,7 +149,11 @@ void AxMailItem::createCacheValues()
- {
- if (mySubject.empty())
- {
-+#if APIVERSNUM >= 10503
-+ if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getSubject(), mySubject, cCharSetConv::SystemCharacterTable(), true))
-+#else
- if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getSubject(), mySubject, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
- {
- wswarn(("AxMailItem::AxMailItem() unable to decode subject line '%s'", mySubject.c_str()));
- } // if
-@@ -157,7 +161,11 @@ void AxMailItem::createCacheValues()
-
- if (myFrom.empty())
- {
-+#if APIVERSNUM >= 10503
-+ if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getFrom(), myFrom, cCharSetConv::SystemCharacterTable(), true))
-+#else
- if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getFrom(), myFrom, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
- {
- wswarn(("AxMailItem::AxMailItem() unable to decode from line '%s'", myFrom.c_str()));
- } // if
---- mailbox-0.4.0/AxMenuMailView.cpp
-+++ mailbox-0.4.0/AxMenuMailView.cpp
-@@ -325,14 +325,22 @@ void AxMenuMailView::updateWithCurrentMa
- std::string aText;
-
- //----- Subject: --------------------------------------------------------
-+#if APIVERSNUM >= 10503
-+ if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getSubject(), aText, cCharSetConv::SystemCharacterTable(), true))
-+#else
- if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getSubject(), aText, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
- {
- wswarn(("AxMenuMailView::updateWithCurrentMail() unable to decode subject line '%s'", aText.c_str()));
- } // if
- myBodyText += string(tr("Subject")) + ":\t " + aText + "\n";
-
- //----- From: ------------------------------------------------------------
-+#if APIVERSNUM >= 10503
-+ if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getFrom(), aText, cCharSetConv::SystemCharacterTable(), true))
-+#else
- if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getFrom(), aText, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
- {
- wswarn(("AxMenuMailView::updateWithCurrentMail() unable to decode from line '%s'", aText.c_str()));
- } // if
-