Fixed charset conversion for menu titles. They will now explicitly be converted

to VDR's locale charset falling back to ISO8859-2 on conversion errors.


git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@5986 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

1 files changed, 14 insertions, 1 deletions

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index f096ba2..b9c01b4 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -25,6 +25,7 @@
 #include <exception>
 #include <iostream>
 #include <vdr/plugin.h>
+#include <glibmm/convert.h>
 #include "systemmenunode.h"
 #include "submenunode.h"
 #include "pluginmenunode.h"
@@ -94,7 +95,7 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode)
             const xmlpp::Attribute* nameAttribute = childElement->get_attribute("name");
 
             string type = childElement->get_name();
-            string name = nameAttribute->get_value();
+            string name = UnicodeToLocaleOrIso8859(nameAttribute->get_value());
 
             if ( type == "menu")
             {
@@ -208,3 +209,15 @@ void MenuConfiguration::AddCommandMenuNode(string name, string command, bool con
 {
     menu->AddChild(new CommandMenuNode(name, command, confirm));
 }
+
+string MenuConfiguration::UnicodeToLocaleOrIso8859(Glib::ustring unicodeString)
+{
+    try
+    {
+        return Glib::locale_from_utf8(unicodeString);
+    }
+    catch (Glib::ConvertError)
+    {
+        return Glib::convert_with_fallback(unicodeString, "ISO8859-2", "UTF-8");
+    }
+}