On Mit, 18 Dez 2002, Juan F. Codagnone wrote:
> Also, it checks the type of the getsockopt's optlen
isn't that equivalent to moving the socklen_t check in front of the socks5
test?
--
Dirk (received 98 mails today)
? autom4te.cache
? plugins/qt-gui/autom4te.cache
? plugins/qt-gui/admin/.acinclude.m4.in.swp
Index: configure.in
===================================================================
RCS file: /cvsroot/licq/licq/configure.in,v
retrieving revision 1.53
diff -u -5 -d -p -r1.53 configure.in
--- configure.in 3 Dec 2002 06:15:39 -0000 1.53
+++ configure.in 19 Dec 2002 04:06:24 -0000
@@ -140,10 +140,11 @@ dlopen(NULL, RTLD_LAZY)
])
AC_CHECK_FUNCS(inet_addr inet_aton mktime select strdup strerror hstrerror readdir_r)
+AC_C_SOCKLEN_T
AC_CHECK_SOCKS5
LICQ_CHECK_OPENSSL
dnl Switch to C++ mode and check for needed C++ headers
AC_LANG_SAVE
@@ -155,11 +156,10 @@ AC_CHECK_HEADER(vector,,
AC_LANG_RESTORE
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
-AC_C_SOCKLEN_T
AC_HEADER_TIME
AC_STRUCT_TM
LICQ_SYS_ERRLIST
LICQ_CHECK_GMTOFF
LICQ_CHECK_TIMEZONE
Index: plugins/qt-gui/src/userbox.cpp
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/userbox.cpp,v
retrieving revision 1.135
diff -u -5 -d -p -r1.135 userbox.cpp
--- plugins/qt-gui/src/userbox.cpp 23 Nov 2002 01:38:27 -0000 1.135
+++ plugins/qt-gui/src/userbox.cpp 19 Dec 2002 04:06:25 -0000
@@ -401,14 +401,15 @@ void CUserViewItem::paintCell( QPainter
if (pix != NULL)
{
QRect r(listView()->itemRect(this));
QPoint pd(r.topLeft()+QPoint(listView()->header()->sectionPos(column), 0));
- listView()->viewport()->mapToParent(pd);
- QPoint pp(listView()->mapToParent(pd));
+ QPoint pp = p->xForm(pd);
+// listView()->viewport()->mapToParent(pd);
+// QPoint pp(listView()->mapToParent(pd));
//p->drawPixmap(0, 0, *pix, pp.x(), pp.y(), width, height());
- p->drawTiledPixmap(0, 0, width, height(), *pix, pp.x(), pp.y());
+// p->drawTiledPixmap(0, 0, width, height(), *pix, pp.x(), pp.y());
}
else
p->fillRect( 0, 0, width, height(), cg.base());
if (m_nUin != 0 || isGroupItem())
@@ -584,11 +585,13 @@ void CUserView::paintEmptyArea( QPainter
pix = QListView::parentWidget()->backgroundPixmap();
#endif
if (pix != NULL)
{
- QPoint pp(mapToParent(r.topLeft()));
+// QPoint pp(mapToParent(r.topLeft()));
+ QPoint pp = p->xForm(r.topLeft());
+
//p->drawPixmap(r.x(), r.y(), *pix, pp.x(), pp.y(), r.width(), r.height());
p->drawTiledPixmap(r.x(), r.y(), r.width(), r.height(), *pix, pp.x(), pp.y());
}
else
{
@@ -718,11 +721,11 @@ UserFloatyList* CUserView::floaties = 0;
//-----UserList::constructor-----------------------------------------------------------------------
CUserView::CUserView(QPopupMenu *m, QWidget *parent, const char *name)
#if QT_VERSION >= 220
: QListView(parent, name, parent == NULL ? WStyle_Customize | WStyle_NoBorder |
WResizeNoErase | WRepaintNoErase /*| WStyle_StaysOnTop*/
- : WRepaintNoErase),
+ : WResizeNoErase | WRepaintNoErase | WPaintUnclipped ),
#else
: QListView(parent, name),
#endif
QToolTip(viewport())
{
@@ -739,13 +742,13 @@ CUserView::CUserView(QPopupMenu *m, QWid
addColumn(gMainWindow->colInfo[i]->m_sTitle, gMainWindow->colInfo[i]->m_nWidth);
setColumnAlignment(i + 1, 1 << gMainWindow->colInfo[i]->m_nAlign);
}
viewport()->setAcceptDrops(true);
- #if QT_VERSION < 300
+// #if QT_VERSION < 300
viewport()->setBackgroundMode(NoBackground);
- #endif
+// #endif
#if QT_VERSION >= 210
setShowSortIndicator(true);
#endif
setAllColumnsShowFocus(true);
@@ -1265,11 +1268,11 @@ void CUserView::maybeTip(const QPoint& c
if (u->AutoResponse() && *u->AutoResponse() &&
item->m_nStatus != ICQ_STATUS_OFFLINE &&
item->m_nStatus != ICQ_STATUS_ONLINE)
#if QT_VERSION >= 300
- s += tr("<br><u>Auto Response:</u>") +
QStyleSheet::convertFromPlainText(codec->toUnicode(u->AutoResponse()),
QStyleSheetItem::WhiteSpaceNormal);
+ s += tr("<br><u>Auto Response:</u>") +
+QStyleSheet::convertFromPlainText(codec->toUnicode(u->AutoResponse()),
+QStyleSheetItem::WhiteSpaceNormal);
#else
s += tr("<br><u>Auto Response:</u>") +
QStyleSheet::convertFromPlainText(codec->toUnicode(u->AutoResponse()));
#endif
gUserManager.DropUser(u);
}
Index: src/icqd.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/icqd.cpp,v
retrieving revision 1.59
diff -u -5 -d -p -r1.59 icqd.cpp
--- src/icqd.cpp 10 Dec 2002 05:52:15 -0000 1.59
+++ src/icqd.cpp 19 Dec 2002 04:06:26 -0000
@@ -1015,11 +1015,12 @@ void CICQDaemon::SendEvent_Server(CPacke
int nResult = pthread_create(&e->thread_send, NULL,
&ProcessRunningEvent_Server_tep, e);
if (nResult != 0)
{
gLog.Error("%sUnable to start server event thread (#%ld):\n%s%s.\n", L_ERRORxSTR,
e->m_nSequence, L_BLANKxSTR, strerror(nResult));
- e->m_eResult = EVENT_ERROR;
+
+ delete e;
}
#else
SendEvent(m_nTCPSrvSocketDesc, *packet, true);
#endif
}
