diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-03-23 19:23:58 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-03-23 19:23:58 +0100 |
| commit | b7d2d7581f5a287ae8104ae06ece2129c0aadbc5 (patch) | |
| tree | 1f9141ac8f25eca66a25eaf880cd76ef49164074 /epgsearch.c | |
| parent | fd47a9dce6ae3e04776b8d76d68e4c43a9a08320 (diff) | |
| download | vdr-plugin-epgsearch-b7d2d7581f5a287ae8104ae06ece2129c0aadbc5.tar.gz vdr-plugin-epgsearch-b7d2d7581f5a287ae8104ae06ece2129c0aadbc5.tar.bz2 | |
autoconfig and autodetecting mail encoding
Diffstat (limited to 'epgsearch.c')
| -rw-r--r-- | epgsearch.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/epgsearch.c b/epgsearch.c index 12a4e43..9258a92 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -65,11 +65,8 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "menu_quicksearch.h" #include "menu_announcelist.h" #include "confdloader.h" -#if APIVERSNUM >= 10503 -#include <langinfo.h> -#endif -static const char VERSION[] = "0.9.25.beta11"; +static const char VERSION[] = "0.9.25.beta12"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals @@ -467,23 +464,8 @@ bool cPluginEpgsearch::Start(void) void cPluginEpgsearch::CheckUTF8() { -#if APIVERSNUM >= 10503 - // Taken from VDR's vdr.c - char *CodeSet = NULL; - if (setlocale(LC_CTYPE, "")) - CodeSet = nl_langinfo(CODESET); - else { - char *LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed - if (LangEnv) { - CodeSet = strchr(LangEnv, '.'); - if (CodeSet) - CodeSet++; // skip the dot - } - } - - if (CodeSet && strcasestr(CodeSet, "UTF-8") != 0) - isUTF8=true; -#endif + std::string CodeSet = GetCodeset(); + isUTF8 = EqualsNoCase(CodeSet, "UTF-8"); } void cPluginEpgsearch::Stop(void) |