[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-578-ga723bc7

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  a723bc73dd2c37ee24e0537e23c6c7b61f0a8dcc (commit)
      from  d28c0857af1346b73564b00091069453db874ace (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a723bc73dd2c37ee24e0537e23c6c7b61f0a8dcc
Author: martii <m4...@gm...>
Date:   Thu May 28 16:53:52 2015 +0200

    zapittools: UTF8_to_Latin1 also std::string
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/dvb/zapit/include/zapit/client/zapittools.h b/dvb/zapit/include/zapit/client/zapittools.h
index 487d2a4..c5ee188 100644
--- a/dvb/zapit/include/zapit/client/zapittools.h
+++ b/dvb/zapit/include/zapit/client/zapittools.h
@@ -29,6 +29,7 @@
 namespace ZapitTools
 {
 	std::string UTF8_to_Latin1 (const char *);
+	std::string UTF8_to_Latin1 (const std::string &s);
 	std::string UTF8_to_UTF8XML(const char *);
 	std::string Latin1_to_UTF8 (const char *);
 }
diff --git a/dvb/zapit/lib/zapittools.cpp b/dvb/zapit/lib/zapittools.cpp
index 1c1ce51..5ef5de5 100644
--- a/dvb/zapit/lib/zapittools.cpp
+++ b/dvb/zapit/lib/zapittools.cpp
@@ -124,4 +124,9 @@ namespace ZapitTools {
 		}
 		return r;
 	}
+	std::string UTF8_to_Latin1(const std::string &s)
+	{
+		return UTF8_to_Latin1(s.c_str());
+	}
+
 }
diff --git a/tuxbox/neutrino/src/gui/nfs.cpp b/tuxbox/neutrino/src/gui/nfs.cpp
index d58bca4..55fde5b 100644
--- a/tuxbox/neutrino/src/gui/nfs.cpp
+++ b/tuxbox/neutrino/src/gui/nfs.cpp
@@ -137,7 +137,7 @@ int CNFSMountGui::exec( CMenuTarget* parent, const std::string & actionKey )
 		for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES; i++)
 		{
 			m_entry[i] = getEntryString(i);
-			ISO_8859_1_entry[i] = ZapitTools::UTF8_to_Latin1(m_entry[i].c_str());
+			ISO_8859_1_entry[i] = ZapitTools::UTF8_to_Latin1(m_entry[i]);
 		}
 	}
 	else if(actionKey.substr(0,7)=="domount")
@@ -178,7 +178,7 @@ int CNFSMountGui::menu()
 	for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++)
 	{
 		std::string s2 = "mountentry" + to_string(i);
-		ISO_8859_1_entry[i] = ZapitTools::UTF8_to_Latin1(m_entry[i].c_str());
+		ISO_8859_1_entry[i] = ZapitTools::UTF8_to_Latin1(m_entry[i]);
 		mountMenuEntry[i] = new CMenuForwarder("", true, ISO_8859_1_entry[i], this, s2.c_str());
 		if (CFSMounter::isMounted(g_settings.network_nfs[i].local_dir))
 			mountMenuEntry[i]->iconName = NEUTRINO_ICON_MOUNTED;

-----------------------------------------------------------------------

Summary of changes:
 dvb/zapit/include/zapit/client/zapittools.h |    1 +
 dvb/zapit/lib/zapittools.cpp                |    5 +++++
 tuxbox/neutrino/src/gui/nfs.cpp             |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)


-- 
Tuxbox-GIT: apps