Merge commit 'origin/master' into tmbinc/FixTimingBugs

4 files changed, 9 insertions, 11 deletions

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 44973af7..bf183f99 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -779,6 +779,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */
 					pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring));
 
+							/* don't do anything if we have 'None' as string */
+				if (pstring == Py_None)
+					continue;
+
 				const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
 				int x = PyInt_AsLong(px) + offset.x();
 				int y = PyInt_AsLong(py) + offset.y();
@@ -945,6 +949,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */
 					ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
 
+							/* don't do anything if we have 'None' as pixmap */
+				if (ppixmap == Py_None)
+					continue;
+
 				int x = PyInt_AsLong(px) + offset.x();
 				int y = PyInt_AsLong(py) + offset.y();
 				int width = PyInt_AsLong(pwidth);
diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index 64699013..6bb45590 100644
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -73,7 +73,7 @@ public:
 	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
 	int currentCursorSelectable();
 	void setList(SWIG_PYOBJECT(ePyObject) list);
-	void setFont(int fnt, gFont *fnt);
+	void setFont(int fnt, gFont *font);
 	void setBuildFunc(SWIG_PYOBJECT(ePyObject) func);
 	void setSelectableFunc(SWIG_PYOBJECT(ePyObject) func);
 	void setItemHeight(int height);
diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 085a749a..ca5c20d7 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -114,15 +114,6 @@ void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
 	invalidate(changed);
 }
 
-std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol)
-{
-	std::string out = in;
-	std::string::size_type loc = 0;
-	while (( loc = out.find(entity, loc)) != std::string::npos )
-	out.replace(loc, entity.length(), symbol);
-	return out;
-}
-
 int eSubtitleWidget::event(int event, void *data, void *data2)
 {
 	switch (event)
diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index 1635e6de..c88df0e6 100644
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -58,7 +58,6 @@ private:
 	gRegion m_visible_region;
 
 	ePtr<gPixmap> m_pixmap;  // pixmap to paint on next evtPaint
-	std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
 };
 
 #endif