[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-408-gb2f5cf6

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  b2f5cf62fdf73a8299a818719bb3274ef4762adf (commit)
       via  8dc94e8c30f1b7c0bfeab7e591b4a315ad60bbd5 (commit)
       via  0f19f1b7027e830724978f7a988acfde59e1302f (commit)
       via  5bf985972bc295090c2b8e6f13a64cf395aecb55 (commit)
       via  8406797072f9718e6dba466bf5318c61ee7ab410 (commit)
       via  3444e646493a5d0e593be208f810bfb9bf53a070 (commit)
       via  b173c9c9e5a79c2fba9da9d8cc71ccda2e41a21b (commit)
      from  c613583a8dbac3d7d39605ea76dee6003bd0fa33 (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 b2f5cf62fdf73a8299a818719bb3274ef4762adf
Author: Christian Schuett <Gau...@ho...>
Date:   Sat Aug 16 14:32:05 2014 +0200

    Neutrino moviebrowser: init 'm_pcFilter' to avoid segfault while starting
    
    Signed-off-by: Christian Schuett <Gau...@ho...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 372f14d..1a078a9 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -442,7 +442,8 @@ void CMovieBrowser::init(void)
 	m_pcLastPlay = NULL;
 	m_pcLastRecord = NULL;
 	m_pcInfo = NULL;
-	
+	m_pcFilter = NULL;
+
 	m_windowFocus = MB_FOCUS_BROWSER;
 
 	initFonts();

commit 8dc94e8c30f1b7c0bfeab7e591b4a315ad60bbd5
Author: Christian Schuett <Gau...@ho...>
Date:   Fri Aug 15 19:48:38 2014 +0200

    Neutrino moviebrowser: clear movie list and infos if last item deleted
    
    Signed-off-by: Christian Schuett <Gau...@ho...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 04e36cb..372f14d 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -1330,12 +1330,13 @@ CFile* CMovieBrowser::getSelectedFile(void)
 void CMovieBrowser::refreshMovieInfo(void)
 {
 	//TRACE("[mb]->refreshMovieInfo \r\n");
-	if (m_vMovieInfo.empty()) return;
-	if (m_movieSelectionHandler == NULL)
+
+	if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL)
 	{
-		// There is no selected element, clear LCD
+		// There is no selected element, clear info box
 		std::string emptytext = " ";
-		m_pcInfo->setText(&emptytext);
+		if (m_pcInfo)
+			m_pcInfo->setText(&emptytext);
 	}
 	else
 	{
@@ -1351,10 +1352,8 @@ void CMovieBrowser::refreshMovieInfo(void)
 ************************************************************************/
 void CMovieBrowser::refreshLCD(void)
 {
-	if (m_vMovieInfo.empty()) return;
-
 	CLCD * lcd = CLCD::getInstance();
-	if(m_movieSelectionHandler == NULL)
+	if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL)
 	{
 		// There is no selected element, clear LCD
 		lcd->showMenuText(0, " ", -1, true); // UTF-8
@@ -1387,7 +1386,11 @@ void CMovieBrowser::refreshFilterList(void)
 	m_FilterLines.lineHeader[0]= "";
 
 	if (m_vMovieInfo.empty()) 
+	{
+		if (m_pcFilter)
+			m_pcFilter->setLines(&m_FilterLines);
 		return; // exit here if nothing else is to do
+	}
 
 	if(m_settings.filter.item == MB_INFO_MAX_NUMBER)
 	{
@@ -1477,7 +1480,12 @@ void CMovieBrowser::refreshLastPlayList(void) //P2
 	m_vHandlePlayList.clear();
 
 	if (m_vMovieInfo.empty()) 
+	{
+		m_currentPlaySelection = 0;
+		if (m_pcLastPlay)
+			m_pcLastPlay->setLines(&m_playListLines);
 		return; // exit here if nothing else is to do
+	}
 
 	MI_MOVIE_INFO* movie_handle;
 	// prepare Browser list for sorting and filtering
@@ -1535,7 +1543,12 @@ void CMovieBrowser::refreshLastRecordList(void) //P2
 	m_vHandleRecordList.clear();
 
 	if (m_vMovieInfo.empty()) 
+	{
+		m_currentRecordSelection = 0;
+		if (m_pcLastRecord)
+			m_pcLastRecord->setLines(&m_recordListLines);
 		return; // exit here if nothing else is to do
+	}
 
 	MI_MOVIE_INFO* movie_handle;
 	// prepare Browser list for sorting and filtering
@@ -1597,7 +1610,8 @@ void CMovieBrowser::refreshBrowserList(void) //P1
 	{
 		m_currentBrowserSelection = 0;
 		m_movieSelectionHandler = NULL;
-		//m_pcBrowser->setLines(&m_browserListLines);
+		if (m_pcBrowser)
+			m_pcBrowser->setLines(&m_browserListLines);
 		return; // exit here if nothing else is to do
 	}
 	

commit 0f19f1b7027e830724978f7a988acfde59e1302f
Author: martii <m4...@gm...>
Date:   Mon Aug 11 17:44:56 2014 +0200

    Neutrino filebrowser: don't show progressbar unless directories were added
    
    Signed-off-by: Christian Schuett <Gau...@ho...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index 222dd6d..611bcd2 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -1047,13 +1047,16 @@ bool CFileBrowser::exec(const char * const dirname)
 
 	if(res && Multi_Select)
 	{
-		CProgressWindow * progress = new CProgressWindow();
-		progress->setTitle(LOCALE_FILEBROWSER_SCAN);
-		progress->exec(NULL,"");
+		CProgressWindow * progress = NULL;
 		for(unsigned int i = 0; i < filelist.size();i++)
 			if(filelist[i].Marked)
 			{
 				if(S_ISDIR(filelist[i].Mode)) {
+					if (!progress) {
+						progress = new CProgressWindow();
+						progress->setTitle(LOCALE_FILEBROWSER_SCAN);
+						progress->exec(NULL,"");
+					}
 #ifdef ENABLE_INTERNETRADIO
 					if (m_Mode == ModeSC)
 						addRecursiveDir(&selected_filelist,filelist[i].Url, true, progress);
@@ -1063,8 +1066,10 @@ bool CFileBrowser::exec(const char * const dirname)
 				} else
 					selected_filelist.push_back(filelist[i]);
 			}
-		progress->hide();
-		delete progress;
+		if (progress) {
+			progress->hide();
+			delete progress;
+		}
 	}
 
 	return res;

commit 5bf985972bc295090c2b8e6f13a64cf395aecb55
Author: Christian Schuett <Gau...@ho...>
Date:   Mon Aug 11 17:38:13 2014 +0200

    nhttpd: fix spelling mistake
    
    based on code by martii <m4...@gm...> in Neutrino-MP Git
    
    Signed-off-by: Christian Schuett <Gau...@ho...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yconnection.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yconnection.cpp
index d047563..fa44582 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yconnection.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yconnection.cpp
@@ -86,10 +86,9 @@ void CWebserverConnection::HandleConnection()
 		if(string_tolower(Request.HeaderList["Connection"]) == "close" 
 			|| (httprotocol != "HTTP/1.1" && string_tolower(Request.HeaderList["Connection"]) != "keep-alive")
 			|| !Webserver->CheckKeepAliveAllowedByIP(sock->get_client_ip()))
-			keep_alive = false;
-#else
-		keep_alive = false;
 #endif
+			keep_alive = false;
+
 		// Send a response
 		Response.SendResponse();
 
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yhook.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yhook.cpp
index a2a70e2..78ff0e0 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yhook.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yhook.cpp
@@ -243,7 +243,7 @@ std::string CyhookHandler::BuildHeader(bool cache)
 		}
 	// print Status-line
 	result = string_printf(HTTP_PROTOCOL " %d %s\r\nContent-Type: %s\r\n",httpStatus, responseString, ResponseMimeType.c_str());
-	log_level_printf(2,"Respose: HTTP/1.1 %d %s\r\nContent-Type: %s\r\n",httpStatus, responseString, ResponseMimeType.c_str());
+	log_level_printf(2,"Response: HTTP/1.1 %d %s\r\nContent-Type: %s\r\n",httpStatus, responseString, ResponseMimeType.c_str());
 
 	switch (httpStatus)
 	{
@@ -282,10 +282,8 @@ std::string CyhookHandler::BuildHeader(bool cache)
 			if(keep_alive)
 				result += "Connection: keep-alive\r\n";
 			else
-				result += "Connection: close\r\n";
-#else
-			result += "Connection: close\r\n";
 #endif
+				result += "Connection: close\r\n";
 			// gzipped ?
 			if(UrlData["fileext"] == "gz")
 				result += "Content-Encoding: gzip\r\n";

commit 8406797072f9718e6dba466bf5318c61ee7ab410
Author: GetAway <get...@t-...>
Date:   Sun Aug 10 20:54:32 2014 +0200

    tuxwetter: add utf8 to latin1 encoding
    
    add encoding of HTML Ampersand Character Code
    larger line spacing for textbox
    fix warning of isspace
    fix sizeof(int)
    
    Signed-off-by: GetAway <get...@t-...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/plugins/tuxwetter/parser.c b/tuxbox/plugins/tuxwetter/parser.c
index a64cd74..f6d70f2 100644
--- a/tuxbox/plugins/tuxwetter/parser.c
+++ b/tuxbox/plugins/tuxwetter/parser.c
@@ -88,7 +88,7 @@ FILE *fh;
 	}
 }
 
-char  *prs_translate(char *trans, char *tfile)
+char  *prs_translate(char *trans, const char *tfile)
 {
 char *sptr;
 int i,found=0;
@@ -314,7 +314,7 @@ int prs_get_dwday(int i, int what, char *out)
 
 //*** XML File ***
 
-int parser(char *citycode, char *trans, int metric, int inet, int ctmo)
+int parser(char *citycode, const char *trans, int metric, int inet, int ctmo)
 {
 	int  rec=0, flag=0;
 	int cc=0, bc=1, exit_ind=-1;
diff --git a/tuxbox/plugins/tuxwetter/parser.h b/tuxbox/plugins/tuxwetter/parser.h
index 02e1996..a23cfdf 100644
--- a/tuxbox/plugins/tuxwetter/parser.h
+++ b/tuxbox/plugins/tuxwetter/parser.h
@@ -126,7 +126,7 @@
 #	define PRE_HMID		71
 #endif
 
-int  parser		(char *,char *, int, int, int);
+int  parser		(char *, const char *, int, int, int);
 int  prs_get_prev_count 	(void);
 /*void prs_get_act_int (int what, char *out);
 void prs_get_act_loc (int what, char *out);
@@ -140,7 +140,7 @@ int  prs_get_dbl (int i, int what, int nacht, char *out);
 int  prs_get_time(int i, int what, char *out, int metric);
 int  prs_get_dtime(int i, int what, char *out, int metric);
 int  prs_get_dwday(int i, int what, char *out);
-char *prs_translate(char *trans, char *tfile);
+char *prs_translate(char *trans, const char *tfile);
 
 #endif // __wxparser__
 
diff --git a/tuxbox/plugins/tuxwetter/php.c b/tuxbox/plugins/tuxwetter/php.c
index d185759..edfcce2 100644
--- a/tuxbox/plugins/tuxwetter/php.c
+++ b/tuxbox/plugins/tuxwetter/php.c
@@ -81,7 +81,14 @@ FILE *fh;
 						}
 						else
 						{
-							if((*(tptr+1)!='#') && (strstr(tptr,"uml;")!=(tptr+2)) && (strstr(tptr,"nbsp;")!=(tptr+1)) && (strstr(tptr,"gt;")!=(tptr+1)) && (strstr(tptr,"lt;")!=(tptr+1)) && (strstr(tptr,"quot;")!=(tptr+1)) && (strstr(tptr,"zlig;")!=(tptr+2)))
+							if ((*(tptr+1) != '#') &&
+								(strstr(tptr,"uml;") != (tptr+2)) &&
+								(strstr(tptr,"nbsp;")!= (tptr+1)) &&
+								(strstr(tptr,"gt;")  != (tptr+1)) &&
+								(strstr(tptr,"lt;")  != (tptr+1)) &&
+								(strstr(tptr,"amp;") != (tptr+1)) &&
+								(strstr(tptr,"quot;")!= (tptr+1)) &&
+								(strstr(tptr,"zlig;")!= (tptr+2)))
 							{
 								rstr[j++]=*tptr++;
 							}
@@ -91,7 +98,14 @@ FILE *fh;
 								cc=' ';
 								switch (*tptr)
 								{
-									case 'a': cc='ä'; break;
+									case 'a': 
+										if((tptr=strchr(tptr+1,'m'))!=NULL) {
+											cc='&';
+										}
+										else {
+											cc='ä';
+										}
+										break;								
 									case 'A': cc='Ä'; break;
 									case 'o': cc='ö'; break;
 									case 'O': cc='Ö'; break;
@@ -164,11 +178,11 @@ FILE *fh;
 					*cut=(sy>=500);
 					if(line)
 					{
-						RenderString("<<", 0, fy, sx, CENTER, 56, CMHT);
+						RenderString("<<", 0, fy+10, sx, CENTER, 56, CMHT);
 					}
 					if(*cut)
 					{
-						RenderString(">>", 0, sy-dy, sx, CENTER, 56, CMHT);
+						RenderString(">>", 0, sy-dy+10, sx, CENTER, 56, CMHT);
 					}
 				}
 			}
diff --git a/tuxbox/plugins/tuxwetter/text.c b/tuxbox/plugins/tuxwetter/text.c
index 792d3ad..4d123ca 100644
--- a/tuxbox/plugins/tuxwetter/text.c
+++ b/tuxbox/plugins/tuxwetter/text.c
@@ -116,7 +116,7 @@ char rc,*rptr=src,*tptr=src;
 			++rptr;
 			rc=*rptr;
 			found=0;
-			for(i=0; i<sizeof(sc) && !found; i++)
+			for(i=0; i<sizeof(sc)/sizeof(sc[0]) && !found; i++)
 			{
 				if(rc==sc[i])
 				{
@@ -175,7 +175,7 @@ int stringlen = 0;
 				else
 				{
 					found=0;
-					for(i=0; i<sizeof(sc) && !found; i++)
+					for(i=0; i<sizeof(sc)/sizeof(sc[0]) && !found; i++)
 					{
 						if(*string==sc[i])
 						{
@@ -259,19 +259,48 @@ void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int si
 			}
 			else
 			{
-				if (*rptr==0xC3)
+				int uml = 0;
+				switch(*rptr)    /* skip Umlauts */
 				{
-					++rptr;
-					switch(*rptr)
+					case '\xc4':
+					case '\xd6':
+					case '\xdc':
+					case '\xe4':
+					case '\xf6':
+					case '\xfc':
+					case '\xdf': uml=1; break;
+				}
+				if (uml == 0)
+				{
+					// UTF8_to_Latin1 encoding
+					if (((*rptr) & 0xf0) == 0xf0)      /* skip (can't be encoded in Latin1) */
+					{
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f'; // ? question mark
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+					}
+					else if (((*rptr) & 0xe0) == 0xe0) /* skip (can't be encoded in Latin1) */
+					{
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+					}
+					else if (((*rptr) & 0xc0) == 0xc0)
 					{
-					case 0x84: *rptr='Ä'; break;
-					case 0x96: *rptr='Ö'; break;
-					case 0x9C: *rptr='Ü'; break;
-					case 0xA4: *rptr='ä'; break;
-					case 0xB6: *rptr='ö'; break;
-					case 0xBC: *rptr='ü'; break;
-					case 0x9F: *rptr='ß'; break;
-					default  : *rptr='.'; break;
+						char c = (((*rptr) & 3) << 6);
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						*rptr = (c | ((*rptr) & 0x3f));
 					}
 				}
 				if((charwidth = RenderChar(*rptr, sx, sy, ex, ((color!=CMCIT) && (color!=CMCST))?varcolor:color)) == -1) return; /* string > maxwidth */
diff --git a/tuxbox/plugins/tuxwetter/tuxwetter.c b/tuxbox/plugins/tuxwetter/tuxwetter.c
index cf36650..ed61faa 100644
--- a/tuxbox/plugins/tuxwetter/tuxwetter.c
+++ b/tuxbox/plugins/tuxwetter/tuxwetter.c
@@ -43,10 +43,10 @@
 #include "lcd.h"
 #include "color.h"
 
-#define P_VERSION 3.64
+#define P_VERSION 3.65
 #define S_VERSION ""
 
-char CONVERT_LIST[]="/var/tuxbox/config/tuxwetter/convert.list";
+const char CONVERT_LIST[]="/var/tuxbox/config/tuxwetter/convert.list";
 #define CFG_FILE 	"/var/tuxbox/config/tuxwetter/tuxwetter.conf"
 #define MCF_FILE 	"/var/tuxbox/config/tuxwetter/tuxwetter.mcfg"
 #define TIME_FILE	"/var/tuxbox/config/tuxwetter/swisstime"
@@ -137,7 +137,7 @@ int Get_Menu();
 void ShowInfo(MENU *m);
 
 // Misc
-char NOMEM[]="Tuxwetter <Out of memory>\n";
+const char NOMEM[]="Tuxwetter <Out of memory>\n";
 unsigned char FONT[64]= "/share/fonts/pakenham.ttf";
 unsigned char *lfb = 0, *lbb = 0;
 int intype=0, show_icons=0, gmodeon=0, ctmo=0, metric=1, loadalways=0, radius=0;
@@ -150,8 +150,8 @@ unsigned char nstr[BUFSIZE]="";
 unsigned char *trstr;
 unsigned char *htmstr;
 unsigned char *proxyadress=NULL, *proxyuserpwd=NULL;
-char INST_FILE[]="/tmp/rc.locked";
-char LCDL_FILE[]="/tmp/lcd.locked";
+const char INST_FILE[]="/tmp/rc.locked";
+const char LCDL_FILE[]="/tmp/lcd.locked";
 int instance=0;
 
 int get_instance(void)
@@ -2436,20 +2436,20 @@ int col1=40,sy=70,dy=26;
 	{
 		fclose(tfh);
 
-		RenderString("X", 0, 34, 619, LEFT, 32, CMCT);
+		RenderString("X", 0, 34, 619, LEFT, 29, CMCT);
 		if(fh_php_getsize(name, plain, &x1, &y1))
 		{
 			printf("Tuxwetter <invalid PHP-Format>\n");
 			return -1;
 		}
-		cs=32.0*((double)(619-1.5*(double)col1)/(double)x1);
-		if(cs>32)
+		cs=FSIZE_MED*((double)(619-1.6*(double)col1)/(double)x1);
+		if(cs>FSIZE_MED-2)
 		{
-			cs=32;
-		}		
+			cs=FSIZE_MED-2;
+		}
+
+		dy=1.1*(double)cs;
 
-		dy=0.8*(double)cs;
-		
 		while(run)
 		{
 			//frame layout
@@ -2642,7 +2642,7 @@ long flength=0;
 												}
 												if(!dontsave)
 												{
-													if((*pt4==' ') && (flength>60))
+													if((*pt4==' ') && (flength>55))
 													{
 														fprintf(fh2,"\n<br>");
 														flength=0;
@@ -3277,7 +3277,7 @@ PLISTENTRY pl=&epl;
 														cnt=0;
 														fprintf(fh2,"<br>");
 														while(*pt1)
-														{	
+														{
 															if(*pt1==' ' && cnt>50) //old 40
 															{
 																fprintf(fh2,"\n<br>");
diff --git a/tuxbox/plugins/tuxwetter/tuxwetter.conf b/tuxbox/plugins/tuxwetter/tuxwetter.conf
index 62d59bc..cf75321 100644
--- a/tuxbox/plugins/tuxwetter/tuxwetter.conf
+++ b/tuxbox/plugins/tuxwetter/tuxwetter.conf
@@ -1,5 +1,5 @@
 ####################################################################################
-####                     New-Tuxwetter Version 3.62
+####                     New-Tuxwetter Version 3.65
 ####                Aktuelle Wetterinfos und Wettervorhersage
 ####
 ####                    Bugreport und Anregungen im Board:
diff --git a/tuxbox/plugins/tuxwetter/tuxwetter.h b/tuxbox/plugins/tuxwetter/tuxwetter.h
index b7f58ab..00cce38 100644
--- a/tuxbox/plugins/tuxwetter/tuxwetter.h
+++ b/tuxbox/plugins/tuxwetter/tuxwetter.h
@@ -30,6 +30,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 #include <unistd.h>
 #include <linux/fb.h>

commit 3444e646493a5d0e593be208f810bfb9bf53a070
Author: GetAway <get...@t-...>
Date:   Wed Jul 23 12:06:45 2014 +0200

    msgbox: add utf8_to_latin1 encoding inspired from Neutrino/Zapittools ;)
    
    Signed-off-by: GetAway <get...@t-...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/tools/msgbox/msgbox.c b/tuxbox/tools/msgbox/msgbox.c
index 615e93b..3d12b93 100644
--- a/tuxbox/tools/msgbox/msgbox.c
+++ b/tuxbox/tools/msgbox/msgbox.c
@@ -33,7 +33,7 @@
 #include <dbox/fb.h>
 #endif
 
-#define M_VERSION 1.72
+#define M_VERSION 1.80
 
 #define FONT    	"/share/fonts/pakenham.ttf"
 
diff --git a/tuxbox/tools/msgbox/text.c b/tuxbox/tools/msgbox/text.c
index b85681f..804f72e 100644
--- a/tuxbox/tools/msgbox/text.c
+++ b/tuxbox/tools/msgbox/text.c
@@ -275,11 +275,55 @@ int RenderString(char *string, int sx, int sy, int maxwidth, int layout, int siz
 			}
 			else
 			{
+				int uml = 0;
+				switch(*rptr)    /* skip Umlauts */
+				{
+					case '\xc4':
+					case '\xd6':
+					case '\xdc':
+					case '\xe4':
+					case '\xf6':
+					case '\xfc':
+					case '\xdf': uml=1; break;
+				}
+				if (uml == 0)
+				{
+					// UTF8_to_Latin1 encoding
+					if (((*rptr) & 0xf0) == 0xf0)      /* skip (can't be encoded in Latin1) */
+					{
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f'; // ? question mark
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+					}
+					else if (((*rptr) & 0xe0) == 0xe0) /* skip (can't be encoded in Latin1) */
+					{
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+					}
+					else if (((*rptr) & 0xc0) == 0xc0)
+					{
+						char c = (((*rptr) & 3) << 6);
+						rptr++;
+						if ((*rptr) == 0)
+							*rptr='\x3f';
+						*rptr = (c | ((*rptr) & 0x3f));
+					}
+				}
 				if((charwidth = RenderChar(*rptr, sx, sy, ex, varcolor)) == -1) return sx; /* string > maxwidth */
 				sx += charwidth;
 			}
 			rptr++;
 		}
-	return stringlen;
+		return stringlen;
 }
 

commit b173c9c9e5a79c2fba9da9d8cc71ccda2e41a21b
Author: GetAway <get...@t-...>
Date:   Sun Jul 13 13:36:33 2014 +0200

    .gitignore expanded
    
    Signed-off-by: GetAway <get...@t-...>
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/.gitignore b/.gitignore
index 99cf5ff..aa50815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,31 @@
 *.*~
+*.a
+*.o
+*.la
+*.lo
+*.pc
+.deps
+.libs
+
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+Makefile.in
+
+COPYING
+INSTALL
+acinclude.m4
+aclocal.m4
+autom4te.cache/
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+
+

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

Summary of changes:
 .gitignore                                         |   30 +++++++++++
 .../daemons/nhttpd/yhttpd_core/yconnection.cpp     |    5 +-
 .../neutrino/daemons/nhttpd/yhttpd_core/yhook.cpp  |    6 +--
 tuxbox/neutrino/src/gui/filebrowser.cpp            |   15 ++++--
 tuxbox/neutrino/src/gui/moviebrowser.cpp           |   33 +++++++++---
 tuxbox/plugins/tuxwetter/parser.c                  |    4 +-
 tuxbox/plugins/tuxwetter/parser.h                  |    4 +-
 tuxbox/plugins/tuxwetter/php.c                     |   22 ++++++--
 tuxbox/plugins/tuxwetter/text.c                    |   55 +++++++++++++++-----
 tuxbox/plugins/tuxwetter/tuxwetter.c               |   28 +++++-----
 tuxbox/plugins/tuxwetter/tuxwetter.conf            |    2 +-
 tuxbox/plugins/tuxwetter/tuxwetter.h               |    1 +
 tuxbox/tools/msgbox/msgbox.c                       |    2 +-
 tuxbox/tools/msgbox/text.c                         |   46 ++++++++++++++++-
 14 files changed, 194 insertions(+), 59 deletions(-)


-- 
Tuxbox-GIT: apps