From 1c8a3aefeb8063526084bc7a24913d2c1f17d1e6 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 1 Jun 2010 00:29:09 +0200 Subject: lib/base/ebase.cpp: remove unneeded code --- lib/base/ebase.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib') diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index caccb391..c84f28b8 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -243,14 +243,9 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy if (this == eApp) { - gOpcode op; - op.dc = 0; - op.opcode = gOpcode::flush; - gRC::getInstance()->submit(op); Py_BEGIN_ALLOW_THREADS ret = ::poll(pfd, fdcount, poll_timeout); Py_END_ALLOW_THREADS - } else ret = ::poll(pfd, fdcount, poll_timeout); -- cgit v1.2.3 From 18e9562c55f0ee01ccc74d48018fd6b67f20f19c Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 4 Jun 2010 14:50:01 +0200 Subject: lib/gui/elistboxcontent.cpp: dont crash on non selectable entries --- lib/gui/elistboxcontent.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 7bb84c3d..43fbc594 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -343,7 +343,6 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (PyTuple_Check(item)) { /* handle left part. get item from tuple, convert to string, display. */ - text = PyTuple_GET_ITEM(item, 0); text = PyObject_Str(text); /* creates a new object - old object was borrowed! */ const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; @@ -357,7 +356,9 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, int value_alignment_left = !*string; /* now, handle the value. get 2nd part from tuple*/ - value = PyTuple_GET_ITEM(item, 1); + if (PyTuple_Size(item) >= 2) // when no 2nd entry is in tuple this is a non selectable entry without config part + value = PyTuple_GET_ITEM(item, 1); + if (value) { ePyObject args = PyTuple_New(1); @@ -468,7 +469,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, } } /* type is borrowed */ - } else + } else if (value) eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); if (value) Py_DECREF(value); -- cgit v1.2.3