You can subscribe to this list here.
1999 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(181) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2000 |
Jan
(238) |
Feb
(325) |
Mar
(301) |
Apr
(309) |
May
(141) |
Jun
(278) |
Jul
(139) |
Aug
(91) |
Sep
(27) |
Oct
(58) |
Nov
(29) |
Dec
(92) |
2001 |
Jan
(19) |
Feb
(37) |
Mar
(43) |
Apr
(1) |
May
(19) |
Jun
(13) |
Jul
(15) |
Aug
(4) |
Sep
(7) |
Oct
(22) |
Nov
(119) |
Dec
(36) |
2002 |
Jan
(34) |
Feb
(10) |
Mar
(44) |
Apr
(10) |
May
(42) |
Jun
(9) |
Jul
(93) |
Aug
(83) |
Sep
(85) |
Oct
(75) |
Nov
(94) |
Dec
(33) |
2003 |
Jan
(86) |
Feb
(84) |
Mar
(136) |
Apr
(49) |
May
(73) |
Jun
(57) |
Jul
(22) |
Aug
|
Sep
(1) |
Oct
(6) |
Nov
(32) |
Dec
(8) |
2004 |
Jan
(52) |
Feb
(46) |
Mar
(22) |
Apr
(1) |
May
(45) |
Jun
(29) |
Jul
(18) |
Aug
(85) |
Sep
(71) |
Oct
(28) |
Nov
(28) |
Dec
(21) |
2005 |
Jan
(42) |
Feb
(19) |
Mar
(19) |
Apr
(60) |
May
(32) |
Jun
(5) |
Jul
(35) |
Aug
(24) |
Sep
(46) |
Oct
(52) |
Nov
(26) |
Dec
(30) |
2006 |
Jan
(12) |
Feb
(9) |
Mar
(8) |
Apr
(27) |
May
(16) |
Jun
(36) |
Jul
(77) |
Aug
(46) |
Sep
(18) |
Oct
|
Nov
|
Dec
|
From: Erik J. <li...@ml...> - 2006-09-13 20:35:49
|
Hi all, All Licq lists will move to Google groups (http://groups.google.com/) this= =20 =46riday. From that day on, all new mail should be sent to the LIST <AT>=20 googlegroups.com address (where LIST is e.g. licq-dev). Your subscription(s) will be transfered to the new list(s), and when the mo= ve=20 is completed, you'll receive an email from Google. If you do filtering, please update your filters. The List-Id header will be= =20 <LIST.googlegroups.com> and this is probably the best way to filter. Most lists have been renamed slightly, and the new list names can be seen=20 below: licq-announce licq-dev (previous licq-devel) licq-users (previous licq-main) licq-tickets (previous licq-bugs) licq-commits (previous licq-cvs) Archive and more information about each list on=20 http://groups.google.com/group/LIST and http://trac.licq.org/wiki/MailingLi= st Cheers // Erik (This message is being cross-posted to all lists, but please keep your repl= y=20 to one list, preferable licq-devel. Thanks!) =2D-=20 It said Use Windows XP or better, so I installed Debian GNU/Linux. Erik Johansson http://ejohansson.se |
From: <em...@us...> - 2006-09-10 08:33:07
|
Author: emostar Date: Sun Sep 10 09:47:43 2006 New Revision: 4606 URL: http://svn.licq.org/viewvc/licq?rev=3D4606&view=3Drev Log: Fix #1371, make each protocol plugin be handled in the auto away handler. Modified: trunk/qt-gui/src/mainwin.cpp Modified: trunk/qt-gui/src/mainwin.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/mainwin.cpp?rev=3D460= 6&r1=3D4605&r2=3D4606&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/mainwin.cpp (original) +++ trunk/qt-gui/src/mainwin.cpp Sun Sep 10 09:47:43 2006 @@ -3960,14 +3960,9 @@ static bool bAutoNA =3D false; static bool bAutoOffline =3D false; =20 - // Fetch current status - unsigned short status =3D ICQ_STATUS_OFFLINE; - ICQOwner *o =3D gUserManager.FetchOwner(LOCK_R); - if (o !=3D NULL) - { - status =3D o->Status(); - gUserManager.DropOwner(); - } + bool bTempAutoAway =3D false; + bool bTempAutoNA =3D false; + bool bTempAutoOffline =3D false; =20 if (mit_info =3D=3D NULL) { @@ -3992,113 +3987,133 @@ } Time idleTime =3D mit_info->idle; =20 - // Check no one changed the status behind our back - if ( (bAutoOffline && status !=3D ICQ_STATUS_OFFLINE) || - (bAutoNA && status !=3D ICQ_STATUS_NA && !bAutoOffline) || - (bAutoAway && status !=3D ICQ_STATUS_AWAY && !bAutoNA && !bAutoOffl= ine) ) - { - bAutoOffline =3D false; - bAutoNA =3D false; - bAutoAway =3D false; - return; - } - -// gLog.Info("offl %d, n/a %d, away %d idlt %d\n", -// bAutoOffline, bAutoNA, bAutoAway, idleTime); - - if ( (autoOfflineTime > 0) && - (unsigned long)idleTime > (unsigned long)(autoOfflineTime * 60000)) - { - if (status !=3D ICQ_STATUS_OFFLINE) - { - changeStatus(ICQ_STATUS_OFFLINE); - bAutoOffline =3D true; - bAutoAway =3D (status =3D=3D ICQ_STATUS_ONLINE || bAutoAway); - bAutoNA =3D ((status =3D=3D ICQ_STATUS_AWAY && bAutoAway) || bAutoNA= ); - } - } - else if ( (autoNATime > 0) && - (unsigned long)idleTime > (unsigned long)(autoNATime * 60000)) - { - if (status !=3D ICQ_STATUS_NA && status !=3D ICQ_STATUS_OFFLINE) - { - if (autoNAMess) + // Go through each protocol, as the statuses may differ + FOR_EACH_PROTO_PLUGIN_START(licqDaemon) + { + unsigned long nPPID =3D (*_ppit)->PPID(); + + // Fetch current status + unsigned short status =3D ICQ_STATUS_OFFLINE; + ICQOwner *o =3D gUserManager.FetchOwner(nPPID, LOCK_R); + if (o !=3D NULL) + { + status =3D o->Status(); + gUserManager.DropOwner(nPPID); + } + + // Check no one changed the status behind our back + if ( (bAutoOffline && status !=3D ICQ_STATUS_OFFLINE) || + (bAutoNA && status !=3D ICQ_STATUS_NA && !bAutoOffline) || + (bAutoAway && status !=3D ICQ_STATUS_AWAY && !bAutoNA && !bAutoOf= fline) ) + { + bAutoOffline =3D false; + bAutoNA =3D false; + bAutoAway =3D false; + return; + } + + // gLog.Info("offl %d, n/a %d, away %d idlt %d\n", + // bAutoOffline, bAutoNA, bAutoAway, idleTime); + + if ( (autoOfflineTime > 0) && + (unsigned long)idleTime > (unsigned long)(autoOfflineTime * 60000= )) + { + if (status !=3D ICQ_STATUS_OFFLINE) { - SARList &sar =3D gSARManager.Fetch(SAR_NA); - ICQOwner *o =3D gUserManager.FetchOwner(LOCK_W); - if (o !=3D 0) + changeStatus(ICQ_STATUS_OFFLINE, nPPID); + bTempAutoOffline =3D true; + bTempAutoAway =3D (status =3D=3D ICQ_STATUS_ONLINE || bAutoAway); + bTempAutoNA =3D ((status =3D=3D ICQ_STATUS_AWAY && bAutoAway) || b= AutoNA); + } + } + else if ( (autoNATime > 0) && + (unsigned long)idleTime > (unsigned long)(autoNATime * 60000)) + { + if (status !=3D ICQ_STATUS_NA && status !=3D ICQ_STATUS_OFFLINE) + { + if (autoNAMess) { - o->SetAutoResponse(QString(sar[autoNAMess-1]->AutoResponse()).lo= cal8Bit()); - gUserManager.DropOwner(); + SARList &sar =3D gSARManager.Fetch(SAR_NA); + ICQOwner *o =3D gUserManager.FetchOwner(nPPID, LOCK_W); + if (o !=3D 0) + { + o->SetAutoResponse(QString(sar[autoNAMess-1]->AutoResponse()).= local8Bit()); + gUserManager.DropOwner(nPPID); + } + gSARManager.Drop(); } - gSARManager.Drop(); + + changeStatus(ICQ_STATUS_NA, nPPID); + bTempAutoNA =3D true; + bTempAutoAway =3D true; } - - changeStatus(ICQ_STATUS_NA); - bAutoNA =3D true; - bAutoAway =3D true; - } - } - else if ( (autoAwayTime > 0) && - (unsigned long)idleTime > (unsigned long)(autoAwayTime * 60000= )) - { - if (status !=3D ICQ_STATUS_AWAY && status !=3D ICQ_STATUS_OFFLINE) - { - if (autoAwayMess) + } + else if ( (autoAwayTime > 0) && + (unsigned long)idleTime > (unsigned long)(autoAwayTime * 600= 00)) + { + if (status !=3D ICQ_STATUS_AWAY && status !=3D ICQ_STATUS_OFFLINE) { - SARList &sar =3D gSARManager.Fetch(SAR_AWAY); - ICQOwner *o =3D gUserManager.FetchOwner(LOCK_W); - if (o !=3D 0) + if (autoAwayMess) { - o->SetAutoResponse(QString(sar[autoAwayMess-1]->AutoResponse()).= local8Bit()); - gUserManager.DropOwner(); + SARList &sar =3D gSARManager.Fetch(SAR_AWAY); + ICQOwner *o =3D gUserManager.FetchOwner(nPPID, LOCK_W); + if (o !=3D 0) + { + o->SetAutoResponse(QString(sar[autoAwayMess-1]->AutoResponse()= )=2Elocal8Bit()); + gUserManager.DropOwner(nPPID); + } + gSARManager.Drop(); } - gSARManager.Drop(); + + changeStatus(ICQ_STATUS_AWAY, nPPID); + bTempAutoAway =3D true; } - - changeStatus(ICQ_STATUS_AWAY); - bAutoAway =3D true; - } - } - else - { - if (bAutoOffline) - { - if (bAutoNA && bAutoAway) + } + else + { + if (bAutoOffline) { - changeStatus(ICQ_STATUS_ONLINE); - bAutoOffline =3D bAutoNA =3D bAutoAway =3D false; + if (bAutoNA && bAutoAway) + { + changeStatus(ICQ_STATUS_ONLINE, nPPID); + bTempAutoOffline =3D bTempAutoNA =3D bTempAutoAway =3D false; + } + else if (bAutoNA) + { + changeStatus(ICQ_STATUS_AWAY, nPPID); + bTempAutoNA =3D bTempAutoOffline =3D false; + } + else + { + changeStatus(ICQ_STATUS_NA, nPPID); + bTempAutoOffline =3D false; + } } else if (bAutoNA) { - changeStatus(ICQ_STATUS_AWAY); - bAutoNA =3D bAutoOffline =3D false; + if (bAutoAway) + { + changeStatus(ICQ_STATUS_ONLINE, nPPID); + bTempAutoNA =3D bTempAutoAway =3D false; + } + else + { + changeStatus(ICQ_STATUS_AWAY, nPPID); + bTempAutoNA =3D false; + } } - else + else if (bAutoAway) { - changeStatus(ICQ_STATUS_NA); - bAutoOffline =3D false; + changeStatus(ICQ_STATUS_ONLINE, nPPID); + bTempAutoAway =3D false; } } - else if (bAutoNA) - { - if (bAutoAway) - { - changeStatus(ICQ_STATUS_ONLINE); - bAutoNA =3D bAutoAway =3D false; - } - else - { - changeStatus(ICQ_STATUS_AWAY); - bAutoNA =3D false; - } - } - else if (bAutoAway) - { - changeStatus(ICQ_STATUS_ONLINE); - bAutoAway =3D false; - } - } + } + FOR_EACH_PROTO_PLUGIN_END + =20 + bAutoOffline =3D bTempAutoOffline; + bAutoNA =3D bTempAutoNA; + bAutoAway =3D bTempAutoAway; =20 #endif // USE_SCRNSAVER } |
From: <em...@us...> - 2006-09-09 15:09:01
|
Author: emostar Date: Sat Sep 9 17:08:41 2006 New Revision: 4605 URL: http://svn.licq.org/viewvc/licq?rev=3D4605&view=3Drev Log: Show authorization grants and requests properly Modified: trunk/licq/src/icqd-srv.cpp Modified: trunk/licq/src/icqd-srv.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/icqd-srv.cpp?rev=3D4605= &r1=3D4604&r2=3D4605&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/icqd-srv.cpp (original) +++ trunk/licq/src/icqd-srv.cpp Sat Sep 9 17:08:41 2006 @@ -4430,6 +4430,56 @@ else gUserManager.DropOwner(LICQ_PPID); =20 + delete [] szId; + delete [] szMsg; + break; + } + + case ICQ_SNACxLIST_AUTHxRESPONS: // The resonse to our authorization r= equest + { + char *szId =3D packet.UnpackUserString(); + unsigned char granted; + + packet >> granted; + unsigned short nMsgLen; + packet >> nMsgLen; + char *szMsg =3D new char[nMsgLen+1]; + for (int i =3D 0; i < nMsgLen; i++) + packet >> szMsg[i]; + szMsg[nMsgLen] =3D '\0'; + + gLog.Info(tr("%sAuthorization %s by %s.\n"), L_SRVxSTR, + granted ? "granted" : "refused", szId); + + CUserEvent *eEvent; + if (granted) + { + eEvent =3D new CEventAuthGranted(szId, LICQ_PPID, szMsg, + ICQ_CMDxRCV_SYSxMSGxONLINE, time(0), 0); + + ICQUser *u =3D gUserManager.FetchUser(szId, LICQ_PPID, LOCK_W); + if (u) + { + u->SetAwaitingAuth(false); + gUserManager.DropUser(u); + } + } + else + { + eEvent =3D new CEventAuthRefused(szId, LICQ_PPID, szMsg, + ICQ_CMDxRCV_SYSxMSGxONLINE, time(0), 0); + } + + ICQOwner *o =3D gUserManager.FetchOwner(LICQ_PPID, LOCK_W); + if (AddUserEvent(o, eEvent)) + { + gUserManager.DropOwner(LICQ_PPID); + eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER); + m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL); + } + else + gUserManager.DropOwner(LICQ_PPID); + delete [] szId; delete [] szMsg; break; |
From: <em...@us...> - 2006-09-09 12:55:13
|
Author: emostar Date: Sat Sep 9 14:54:41 2006 New Revision: 4604 URL: http://svn.licq.org/viewvc/licq?rev=3D4604&view=3Drev Log: Some more changes for the new API in the MSN plugin. From some time ago act= ually... Modified: branches/newapi/msn/ (props changed) branches/newapi/msn/configure.in branches/newapi/msn/src/msn-sb.cpp branches/newapi/msn/src/msn-srv.cpp branches/newapi/msn/src/msn.cpp branches/newapi/msn/src/msn.h branches/newapi/msn/src/msnevent.cpp branches/newapi/msn/src/msnevent.h branches/newapi/msn/src/plugin.cpp Propchange: branches/newapi/msn/ ---------------------------------------------------------------------------= --- --- svn:externals (added) +++ svn:externals Sat Sep 9 14:54:41 2006 @@ -1,0 +1,1 @@ +admin http://svn.licq.org/svn/branches/newapi/admin Modified: branches/newapi/msn/configure.in URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/configure.in?rev= =3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/configure.in (original) +++ branches/newapi/msn/configure.in Sat Sep 9 14:54:41 2006 @@ -42,6 +42,7 @@ LICQ_SYS_ERRLIST LICQ_CHECK_LICQ LICQ_CHECK_OPENSSL +AC_CHECK_BOOST =20 dnl Checks for library functions. AC_CHECK_FUNCS(inet_addr inet_aton strerror strndup) Modified: branches/newapi/msn/src/msn-sb.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msn-sb.cpp?rev= =3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msn-sb.cpp (original) +++ branches/newapi/msn/src/msn-sb.cpp Sat Sep 9 14:54:41 2006 @@ -55,13 +55,13 @@ packet->SkipParameter(); // total users in conversation string strUser =3D packet->GetParameter(); =20 - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOC= K_R); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_R); if (!u) { m_pDaemon->AddUserToList(strUser.c_str(), MSN_PPID, false, true); =20 // MSN uses UTF-8 so we need to set this for all new users automat= ically - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID,= LOCK_W); if (u) // To be safe { u->SetEnableSave(false); @@ -112,7 +112,7 @@ packet->SkipRN(); packet->SkipRN(); packet->SkipRN(); - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID,= LOCK_W); if (u) { u->SetTyping(ICQ_TYPING_ACTIVE); @@ -133,7 +133,7 @@ szMsg[i] =3D '\0'; =20 CEventMsg *e =3D CEventMsg::Parse(szMsg, ICQ_CMDxRCV_SYSxMSGxOFFLI= NE, time(0), 0, SocketToCID(nSock)); - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID,= LOCK_W); if (u) u->SetTyping(0); if (m_pDaemon->AddUserEvent(u, e)) @@ -197,7 +197,7 @@ for (int i =3D 0; i < pConv->NumUsers(); i++) { string strUser =3D pConv->GetUser(i); - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_P= PID, LOCK_R); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN= _PPID, LOCK_R); if (u) { e->m_pUserEvent->AddToHistory(u, MSN_PPID, D_SENDER); @@ -210,7 +210,7 @@ } else { - ICQUser *u =3D gUserManager.FetchUser(e->m_szId, e->m_nPPID, L= OCK_R); + CLicqUser *u =3D gUserManager.FetchUser(e->m_szId, e->m_nPPID,= LOCK_R); if (u !=3D NULL) { e->m_pUserEvent->AddToHistory(u, MSN_PPID, D_SENDER); @@ -312,7 +312,7 @@ m_pDaemon->RemoveUserConversation(nSock, strUser.c_str()); CConversation *pConv =3D m_pDaemon->FindConversation(nSock); =20 - ICQUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c_s= tr()), MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c= _str()), MSN_PPID, LOCK_W); if (u) { u->ClearSocketDesc(ICQ_CHNxNONE); @@ -377,7 +377,7 @@ =20 void CMSN::Send_SB_Packet(string &strUser, CMSNPacket *p, int nSocket, boo= l bDelete) { - ICQUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c_str()= ), MSN_PPID, LOCK_R); + CLicqUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c_str= ()), MSN_PPID, LOCK_R); if (!u) return; =20 int nSock =3D nSocket !=3D -1 ? nSocket : u->SocketDesc(ICQ_CHNxNONE); @@ -397,7 +397,7 @@ m_pDaemon->RemoveUserConversation(nSock, strUser.c_str()); CConversation *pConv =3D m_pDaemon->FindConversation(nSock); =20 - ICQUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c_str= ()), MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(const_cast<char *>(strUser.c_s= tr()), MSN_PPID, LOCK_W); if (u) { u->ClearSocketDesc(ICQ_CHNxNONE); @@ -468,7 +468,7 @@ =20 gSocketMan.AddSocket(sock); int nSocket =3D sock->Descriptor(); - ICQUser *u =3D gUserManager.FetchUser(pStart->m_szUser, MSN_PPID, LOCK_W= ); + CLicqUser *u =3D gUserManager.FetchUser(pStart->m_szUser, MSN_PPID, LOCK= _W); if (u) { if (pStart->m_bDataConnection) @@ -516,7 +516,7 @@ strCookie.c_str(), m_szUserName); bool bNewUser =3D false; int nSocket =3D sock->Descriptor(); - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOCK_= W); if (u) { u->SetSocketDesc(sock); @@ -542,7 +542,7 @@ =20 void CMSN::MSNSendInvitation(char *_szUser, CMSNPacket *_pPacket) { - //ICQUser *u =3D gUserManager.FetchUser(_szUser, MSN_PPID, LOCK_R); + //CLicqUser *u =3D gUserManager.FetchUser(_szUser, MSN_PPID, LOCK_R); //if (!u) return; //gUserManager.DropUser(u); =20 @@ -576,7 +576,7 @@ nSocket =3D pConv->Socket(); }=20 =20 - ICQUser *u =3D gUserManager.FetchUser(_szUser, MSN_PPID, LOCK_R); + CLicqUser *u =3D gUserManager.FetchUser(_szUser, MSN_PPID, LOCK_R); if (!u) return; gUserManager.DropUser(u); =20 Modified: branches/newapi/msn/src/msn-srv.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msn-srv.cpp?re= v=3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msn-srv.cpp (original) +++ branches/newapi/msn/src/msn-srv.cpp Sat Sep 9 14:54:41 2006 @@ -171,7 +171,7 @@ !gUserManager.IsOnList(strUser.c_str(), MSN_PPID)) m_pDaemon->AddUserToList(strUser.c_str(), MSN_PPID); =20 - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOC= K_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); if (u) { u->SetEnableSave(false); @@ -229,7 +229,7 @@ { gLog.Info("%sAdded %s to contact list.\n", L_MSNxSTR, strUser.c_st= r()); =20 - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID,= LOCK_W); if (u) { if (!u->KeepAliasOnUpdate()) @@ -275,7 +275,7 @@ { packet->SkipParameter(); // seq string strStatus =3D packet->GetParameter(); - ICQUser *o =3D gUserManager.FetchOwner(MSN_PPID, LOCK_W); + CLicqUser *o =3D gUserManager.FetchOwner(MSN_PPID, LOCK_W); unsigned long nStatus; =20 if (strStatus =3D=3D "NLN") @@ -289,7 +289,7 @@ =20 m_pDaemon->ChangeUserStatus(o, nStatus); m_nStatus =3D nStatus; - gLog.Info("%sServer says we are now: %s\n", L_MSNxSTR, ICQUser::Stat= usToStatusStr(o->Status(), false)); + gLog.Info("%sServer says we are now: %s\n", L_MSNxSTR, CLicqUser::St= atusToStatusStr(o->Status(), false)); gUserManager.DropOwner(MSN_PPID); } else if (strCmd =3D=3D "ILN" || strCmd =3D=3D "NLN") @@ -308,7 +308,7 @@ if (strStatus =3D=3D "NLN") nStatus =3D ICQ_STATUS_ONLINE; =20 - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOC= K_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); if (u) { u->SetOnlineSince(time(NULL)); // Not in this protocol @@ -346,7 +346,7 @@ { string strUser =3D packet->GetParameter(); =20 - ICQUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, LOC= K_W); + CLicqUser *u =3D gUserManager.FetchUser(strUser.c_str(), MSN_PPID, L= OCK_W); if (u) { gLog.Info("%s%s logged off.\n", L_MSNxSTR, u->GetAlias()); @@ -600,7 +600,7 @@ =20 void CMSN::MSNAddUser(char *szUser) { - ICQUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); u->SetEnableSave(false); u->SetUserEncoding("UTF-8"); u->SetEnableSave(true); @@ -619,7 +619,7 @@ =20 void CMSN::MSNRenameUser(char *szUser) { - ICQUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_R); + CLicqUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_R); if (!u) return; char *szNewNick =3D u->GetAlias(); gUserManager.DropUser(u); @@ -646,7 +646,7 @@ =20 void CMSN::MSNBlockUser(char *szUser) { - ICQUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); if (u) { u->SetInvisibleList(true); @@ -665,7 +665,7 @@ =20 void CMSN::MSNUnblockUser(char *szUser) { - ICQUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(szUser, MSN_PPID, LOCK_W); if (u) { u->SetInvisibleList(false); Modified: branches/newapi/msn/src/msn.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msn.cpp?rev=3D= 4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msn.cpp (original) +++ branches/newapi/msn/src/msn.cpp Sat Sep 9 14:54:41 2006 @@ -66,12 +66,12 @@ =20 void *MSNPing_tep(void *); =20 -CMSN::CMSN(CICQDaemon *_pDaemon, int _nPipe) : m_vlPacketBucket(211) +CMSN::CMSN(CLicqDaemon *_pDaemon) : m_vlPacketBucket(211) { m_pDaemon =3D _pDaemon; m_bExit =3D false; m_bWaitingPingReply =3D m_bCanPing =3D false; - m_nPipe =3D _nPipe; + m_nPipe =3D 0;//XXX _nPipe; m_nSSLSocket =3D m_nServerSocket =3D m_nNexusSocket =3D -1; m_pPacketBuf =3D 0; m_pNexusBuff =3D 0; Modified: branches/newapi/msn/src/msn.h URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msn.h?rev=3D46= 04&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msn.h (original) +++ branches/newapi/msn/src/msn.h Sat Sep 9 14:54:41 2006 @@ -79,7 +79,7 @@ class CMSN { public: - CMSN(CICQDaemon *, int); + CMSN(CLicqDaemon *); ~CMSN(); =20 void Run(); @@ -141,14 +141,14 @@ CMSNDataEvent *FetchDataEvent(const string &, int); CMSNDataEvent *FetchStartDataEvent(const string &); =20 - // Interface to CICQDaemon + // Interface to CLicqDaemon void PushPluginSignal(CICQSignal *); =20 // Config unsigned long m_nListVersion; =20 // Variables - CICQDaemon *m_pDaemon; + CLicqDaemon *m_pDaemon; bool m_bExit; int m_nPipe; int m_nServerSocket; Modified: branches/newapi/msn/src/msnevent.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msnevent.cpp?r= ev=3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msnevent.cpp (original) +++ branches/newapi/msn/src/msnevent.cpp Sat Sep 9 14:54:41 2006 @@ -207,7 +207,7 @@ close(m_nFileDesc); m_nFileDesc =3D -1; m_eState =3D STATE_FINISHED; - ICQUser *u =3D gUserManager.FetchUser(m_strId.c_str(), MSN_PPID, LOCK_W); + CLicqUser *u =3D gUserManager.FetchUser(m_strId.c_str(), MSN_PPID, LOCK_W= ); if (u) { u->SetPicturePresent(true); Modified: branches/newapi/msn/src/msnevent.h URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/msnevent.h?rev= =3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/msnevent.h (original) +++ branches/newapi/msn/src/msnevent.h Sat Sep 9 14:54:41 2006 @@ -31,7 +31,7 @@ =20 protected: CMSN *m_pMSN; - CICQDaemon *m_pDaemon; + CLicqDaemon *m_pDaemon; =20 int m_nSocketDesc; unsigned long m_nEvent; Modified: branches/newapi/msn/src/plugin.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/msn/src/plugin.cpp?rev= =3D4604&r1=3D4603&r2=3D4604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/msn/src/plugin.cpp (original) +++ branches/newapi/msn/src/plugin.cpp Sat Sep 9 14:54:41 2006 @@ -18,59 +18,28 @@ =20 #include "licq_icqd.h" #include "licq_user.h" -#include "licq_protoplugin.h" =20 +#include "msn_plugin.h" #include "msn.h" =20 -char *LProto_Name() +class CLicqDaemon; + +CMSNPlugin::CMSNPlugin() { - static char szName[] =3D "MSN"; - return szName; } =20 -char *LProto_Version() +CMSNPlugin::~CMSNPlugin() { - static char szVersion[] =3D "0.11"; - return szVersion; } =20 -const char *LProto_Description() +int CMSNPlugin::runPlugin(CLicqDaemon *pDaemon) { - static char szDesc[] =3D "MSN Protocol Plugin"; - return szDesc; -} + boost::shared_ptr<CMSN> pMSN(new CMSN(pDaemon)); + pMSN->Run(); =20 -unsigned long LProto_SendFuncs() -{ - return (PP_SEND_MSG | PP_SEND_AUTH | PP_SEND_AUTHxREQ); -} - -unsigned long LProto_Capabilities() -{ return 0; } =20 -int LProto_Main(CICQDaemon *_pDaemon) -{ - int nPipe =3D _pDaemon->RegisterProtoPlugin(); =20 +extern "C" ProtocolPlugin *createPlugin() { return new CMSNPlugin; } =20 - CMSN *pMSN =3D new CMSN(_pDaemon, nPipe); - pMSN->Run(); - - _pDaemon->UnregisterProtoPlugin(); - =20 - delete pMSN; - =20 - return 0; -} - -char *LProto_PPID() -{ - static char szId[] =3D "MSN_"; - return szId; -} - -bool LProto_Init() -{ - return true; -} +extern "C" void destroyPlugin(ProtocolPlugin *p) { delete p; } |
From: <em...@us...> - 2006-09-09 08:17:21
|
Author: emostar Date: Sat Sep 9 10:17:01 2006 New Revision: 4603 URL: http://svn.licq.org/viewvc/licq?rev=3D4603&view=3Drev Log: Fix a crash, see the comments for more details. Don't show the "Next", "More" buttons if there is no pending items. Untested code though. Modified: trunk/qt-gui/src/ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/ewidgets.cpp?rev=3D46= 03&r1=3D4602&r2=3D4603&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/ewidgets.cpp (original) +++ trunk/qt-gui/src/ewidgets.cpp Sat Sep 9 10:17:01 2006 @@ -1195,6 +1195,8 @@ m_btnNext->setText("&Next"); m_btnNext->setEnabled(false); m_btnMore->setEnabled(false); + m_btnNext->hide(); + m_btnMore->hide(); m_btnClear->setText("&Ok"); showExtension(false); // We are opening the window, so default to not = showing this } @@ -1206,9 +1208,15 @@ QString nextStr =3D QString("&Next (%1)").arg(m_nUnreadNum); m_btnNext->setText(nextStr); if (!m_btnNext->isEnabled()) + { m_btnNext->setEnabled(true); + m_btnNext->show(); + } if (!m_btnMore->isEnabled()) + { m_btnMore->setEnabled(true); + m_btnMore->show(); + } } =20 // Add it to the list @@ -1432,8 +1440,13 @@ void CLicqMessageManager::addMessage(QMessageBox::Icon type, const QString= &msg, QWidget *parent) { + // We should pass parent to it, but it causes a crash after the parent c= loses + // and we try to show another message box. I tried to reparent m_pMsgDlg= , but + // that didnt help much. + // So for now.. we do this: + parent =3D 0; // XXX See comment above if (m_pMsgDlg =3D=3D 0) - m_pMsgDlg =3D new CLicqMessageBox(parent); + m_pMsgDlg =3D new CLicqMessageBox(parent);=20 =20 m_pMsgDlg->addMessage(type, msg); m_pMsgDlg->show(); |
From: <em...@us...> - 2006-09-09 07:21:03
|
Author: emostar Date: Sat Sep 9 08:54:09 2006 New Revision: 4602 URL: http://svn.licq.org/viewvc/licq?rev=3D4602&view=3Drev Log: Patch by Arne Schmitz to show the correct number of waiting messages. Modified: trunk/qt-gui/src/ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/ewidgets.cpp?rev=3D46= 02&r1=3D4601&r2=3D4602&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/ewidgets.cpp (original) +++ trunk/qt-gui/src/ewidgets.cpp Sat Sep 9 08:54:09 2006 @@ -1302,6 +1302,7 @@ QListViewItemIterator it(m_lstMsg); while (it.current()) delete it.current(); + m_nUnreadNum =3D 0; } =20 /// //////////////////////////////////////////////////////// @@ -1336,6 +1337,7 @@ // No more unread messages nextStr =3D QString("&Next"); m_btnNext->setEnabled(false); + m_nUnreadNum =3D 0; } m_btnNext->setText(nextStr); } |
From: <er...@us...> - 2006-09-08 22:44:25
|
Author: erijo Date: Sat Sep 9 00:44:03 2006 New Revision: 4601 URL: http://svn.licq.org/viewvc/licq?rev=3D4601&view=3Drev Log: Compilation fix (until we start using the namespace). Modified: branches/newapi/licq/include/licq_plugin.h Modified: branches/newapi/licq/include/licq_plugin.h URL: http://svn.licq.org/viewvc/licq/branches/newapi/licq/include/licq_plug= in.h?rev=3D4601&r1=3D4600&r2=3D4601&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/licq/include/licq_plugin.h (original) +++ branches/newapi/licq/include/licq_plugin.h Sat Sep 9 00:44:03 2006 @@ -151,11 +151,12 @@ std::string getBuildDate() const; \ std::string getBuildTime() const; =20 +//FIXME NEWAPI namespace Licq #define LICQ_IMPLEMENT_PLUGIN(className) \ extern "C" { \ - Licq::CPlugin *createLicqPlugin(Licq::CLicqDaemon &daemon) \ + CPlugin *createLicqPlugin(CLicqDaemon &daemon) \ { return new className (daemon); } \ - void destroyLicqPlugin(Licq::CPlugin *instance) \ + void destroyLicqPlugin(CPlugin *instance) \ { delete instance; } \ unsigned int getLicqPluginApiVersion() \ { return LICQ_PLUGIN_API_VERSION; } \ |
From: <er...@us...> - 2006-09-08 22:35:30
|
Author: erijo Date: Sat Sep 9 00:35:09 2006 New Revision: 4600 URL: http://svn.licq.org/viewvc/licq?rev=3D4600&view=3Drev Log: Fix compilation errors introduced in r4599 (CICQDaemon and ICQUser has been= renamed in this branch). Modified: branches/newapi/licq/src/icqd-srv.cpp branches/newapi/licq/src/icqd.cpp Modified: branches/newapi/licq/src/icqd-srv.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/licq/src/icqd-srv.cpp?= rev=3D4600&r1=3D4599&r2=3D4600&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/licq/src/icqd-srv.cpp (original) +++ branches/newapi/licq/src/icqd-srv.cpp Sat Sep 9 00:35:09 2006 @@ -2904,7 +2904,7 @@ // an AIM user if (bFake && isdigit(szId[0])) { - ICQUser *user =3D gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R); + CLicqUser *user =3D gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R); gLog.Error("%sIgnoring fake offline: %s (%s)\n", L_SRVxSTR, user->GetAlias(), szId); delete [] szId; Modified: branches/newapi/licq/src/icqd.cpp URL: http://svn.licq.org/viewvc/licq/branches/newapi/licq/src/icqd.cpp?rev= =3D4600&r1=3D4599&r2=3D4600&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/newapi/licq/src/icqd.cpp (original) +++ branches/newapi/licq/src/icqd.cpp Sat Sep 9 00:35:09 2006 @@ -1777,7 +1777,7 @@ /** * Search the running event queue for a specific event by subsequence. */ -bool CICQDaemon::hasServerEvent(unsigned long _nSubSequence) +bool CLicqDaemon::hasServerEvent(unsigned long _nSubSequence) { bool hasEvent =3D false; pthread_mutex_lock(&mutex_runningevents); |
Author: erijo Date: Fri Sep 8 23:57:51 2006 New Revision: 4599 URL: http://svn.licq.org/viewvc/licq?rev=3D4599&view=3Drev Log: Merged trunk changes r4394:4598 into the newapi branch. [This commit notification would consist of 6 parts,=20 which exceeds the limit of 5 ones, so it was shortened to the summary.] |
From: <er...@us...> - 2006-09-08 20:57:58
|
Author: erijo Date: Fri Sep 8 22:57:30 2006 New Revision: 4598 URL: http://svn.licq.org/viewvc/licq?rev=3D4598&view=3Drev Log: Changed admin external to point to the only in this branch. Modified: branches/newapi/auto-reply/ (props changed) branches/newapi/console/ (props changed) branches/newapi/email/ (props changed) branches/newapi/msn/ (props changed) branches/newapi/qt-gui/ (props changed) branches/newapi/rms/ (props changed) Propchange: branches/newapi/auto-reply/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin Propchange: branches/newapi/console/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin Propchange: branches/newapi/email/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin Propchange: branches/newapi/msn/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin Propchange: branches/newapi/qt-gui/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin Propchange: branches/newapi/rms/ ---------------------------------------------------------------------------= --- --- svn:externals (original) +++ svn:externals Fri Sep 8 22:57:30 2006 @@ -1,1 +1,1 @@ -admin http://svn.licq.org/svn/trunk/licq-common/admin +admin http://svn.licq.org/svn/branches/newapi/admin |
From: <er...@us...> - 2006-09-08 12:04:11
|
Author: erijo Date: Fri Sep 8 14:04:04 2006 New Revision: 4597 URL: http://svn.licq.org/viewvc/licq?rev=3D4597&view=3Drev Log: Make it possible to chose firefox or seamonkey as url viewer. Closes #1390. Modified: trunk/qt-gui/src/optionsdlg.cpp Modified: trunk/qt-gui/src/optionsdlg.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/optionsdlg.cpp?rev=3D= 4597&r1=3D4596&r2=3D4597&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/optionsdlg.cpp (original) +++ trunk/qt-gui/src/optionsdlg.cpp Fri Sep 8 14:04:04 2006 @@ -1503,11 +1503,13 @@ #ifdef USE_KDE cmbUrlViewer->insertItem(DEFAULT_URL_VIEWER); #endif + cmbUrlViewer->insertItem("viewurl-firefox.sh"); cmbUrlViewer->insertItem("viewurl-lynx.sh"); cmbUrlViewer->insertItem("viewurl-mozilla.sh"); cmbUrlViewer->insertItem("viewurl-ncftp.sh"); cmbUrlViewer->insertItem("viewurl-netscape.sh"); cmbUrlViewer->insertItem("viewurl-opera.sh"); + cmbUrlViewer->insertItem("viewurl-seamonkey.sh"); cmbUrlViewer->insertItem("viewurl-w3m.sh"); =20 lblTerminal =3D new QLabel(tr("Terminal:"), boxExtensions); |
From: <er...@us...> - 2006-09-08 12:03:15
|
Author: erijo Date: Fri Sep 8 14:02:59 2006 New Revision: 4596 URL: http://svn.licq.org/viewvc/licq?rev=3D4596&view=3Drev Log: Add viewurl-seamonkey.sh and viewurl-firefox.sh as suggest by Dmitry A. Kop= tev in #1390. Added: trunk/licq/bin/viewurl-firefox.sh - copied, changed from r4595, trunk/licq/bin/viewurl-mozilla.sh trunk/licq/bin/viewurl-seamonkey.sh - copied, changed from r4595, trunk/licq/bin/viewurl-mozilla.sh Modified: trunk/licq/bin/viewurl-mozilla.sh Copied: trunk/licq/bin/viewurl-firefox.sh (from r4595, trunk/licq/bin/viewu= rl-mozilla.sh) URL: http://svn.licq.org/viewvc/licq/trunk/licq/bin/viewurl-firefox.sh?p2= =3Dtrunk/licq/bin/viewurl-firefox.sh&p1=3Dtrunk/licq/bin/viewurl-mozilla.sh= &r1=3D4595&r2=3D4596&rev=3D4596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/bin/viewurl-mozilla.sh (original) +++ trunk/licq/bin/viewurl-firefox.sh Fri Sep 8 14:02:59 2006 @@ -12,7 +12,7 @@ # - VURL_MOZILLA # Your mozilla binary. Defaults to 'mozilla' # - VURL_HOME -# Your homepage. Defaults to 'www.linux.org'. This page is +# Your homepage. Defaults to 'www.licq.org'. This page is # opened if this script is called without parameters # - VURL_OPENMODE # Method of opening the URL. @@ -22,7 +22,7 @@ # =20 if [ -z "${VURL_MOZILLA}" ]; then - MOZILLA=3Dmozilla + MOZILLA=3Dfirefox else MOZILLA=3D${VURL_MOZILLA} fi @@ -54,5 +54,3 @@ # If mozilla is already running, open the URL as new tab, # otherwise launch a fresh copy of mozilla. ((${MOZILLA} -remote openurl\("${OPENSTRING}"\) ) || (${MOZILLA} "${URL}"= ) & ) > /dev/null 2>&1 - - Modified: trunk/licq/bin/viewurl-mozilla.sh URL: http://svn.licq.org/viewvc/licq/trunk/licq/bin/viewurl-mozilla.sh?rev= =3D4596&r1=3D4595&r2=3D4596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/bin/viewurl-mozilla.sh (original) +++ trunk/licq/bin/viewurl-mozilla.sh Fri Sep 8 14:02:59 2006 @@ -12,7 +12,7 @@ # - VURL_MOZILLA # Your mozilla binary. Defaults to 'mozilla' # - VURL_HOME -# Your homepage. Defaults to 'www.linux.org'. This page is +# Your homepage. Defaults to 'www.licq.org'. This page is # opened if this script is called without parameters # - VURL_OPENMODE # Method of opening the URL. @@ -54,5 +54,3 @@ # If mozilla is already running, open the URL as new tab, # otherwise launch a fresh copy of mozilla. ((${MOZILLA} -remote openurl\("${OPENSTRING}"\) ) || (${MOZILLA} "${URL}"= ) & ) > /dev/null 2>&1 - - Copied: trunk/licq/bin/viewurl-seamonkey.sh (from r4595, trunk/licq/bin/vie= wurl-mozilla.sh) URL: http://svn.licq.org/viewvc/licq/trunk/licq/bin/viewurl-seamonkey.sh?p2= =3Dtrunk/licq/bin/viewurl-seamonkey.sh&p1=3Dtrunk/licq/bin/viewurl-mozilla.= sh&r1=3D4595&r2=3D4596&rev=3D4596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/bin/viewurl-mozilla.sh (original) +++ trunk/licq/bin/viewurl-seamonkey.sh Fri Sep 8 14:02:59 2006 @@ -12,7 +12,7 @@ # - VURL_MOZILLA # Your mozilla binary. Defaults to 'mozilla' # - VURL_HOME -# Your homepage. Defaults to 'www.linux.org'. This page is +# Your homepage. Defaults to 'www.licq.org'. This page is # opened if this script is called without parameters # - VURL_OPENMODE # Method of opening the URL. @@ -22,7 +22,7 @@ # =20 if [ -z "${VURL_MOZILLA}" ]; then - MOZILLA=3Dmozilla + MOZILLA=3Dseamonkey else MOZILLA=3D${VURL_MOZILLA} fi @@ -54,5 +54,3 @@ # If mozilla is already running, open the URL as new tab, # otherwise launch a fresh copy of mozilla. ((${MOZILLA} -remote openurl\("${OPENSTRING}"\) ) || (${MOZILLA} "${URL}"= ) & ) > /dev/null 2>&1 - - |
From: <er...@us...> - 2006-09-04 17:48:54
|
Author: erijo Date: Mon Sep 4 19:27:28 2006 New Revision: 4595 URL: http://svn.licq.org/viewvc/licq?rev=3D4595&view=3Drev Log: Misc updates: * Changed the wiki link to trac.licq.org * Added news item for 1.3.4 RC1. * Updated some links. Added: trunk/website/news/47 Modified: trunk/website/bugs.php trunk/website/contact.php trunk/website/footer.php trunk/website/index.php trunk/website/news/last_id Modified: trunk/website/bugs.php URL: http://svn.licq.org/viewvc/licq/trunk/website/bugs.php?rev=3D4595&r1= =3D4594&r2=3D4595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/bugs.php (original) +++ trunk/website/bugs.php Mon Sep 4 19:27:28 2006 @@ -15,7 +15,7 @@ <ol> <li> Check the open and closed bugs (called tickets) at the = <a href=3D"http://trac.licq.org/">Bug Tracking</a> site.</li> =20 - <li> Check the <a href=3D"http://sourceforge.net/mail/?group= _id=3D254">Licq mailing lists</a>.</li> + <li> Check the <a href=3D"http://trac.licq.org/wiki/MailingL= ist">Licq mailing lists</a>.</li> <li> Ensure that the problem can be reproduced with the late= st <a href=3D"/daily.php">SVN Snapshot</a>. If it cannot be reproduced then= please do not report it.</li> <li> Ensure that you have included an email address where yo= u can be reached for questions.</li> <li> Be as descriptive as you can about the bug. Include OS,= OS Version, Qt Version if you are using the qt-gui, Error messages, etc.. = Not just "It does not work".</li> @@ -32,7 +32,7 @@ <!-- News Item Begin--> <div class=3D"news"> <h2>Feature Requests</h2> - <p>Before submitting feature requests, or if you want to hel= p with Licq, see the <a href=3D"http://trac.licq.org/query?status=3Dnew&= ;status=3Dassigned&status=3Dreopened&type=3DFeature+Requests&or= der=3Did">list of requested features</a>. If you are curious about upcomin= g features, see the <a href=3D"http://trac.licq.org/roadmap">roadmap</a>.</= p> + <p>Before submitting feature requests, or if you want to hel= p with Licq, see the <a href=3D"http://trac.licq.org/query?status=3Dnew&= ;status=3Dassigned&status=3Dreopened&type=3Denhancement&order= =3Did">list of requested features</a>. If you are curious about upcoming fe= atures, see the <a href=3D"http://trac.licq.org/roadmap">roadmap</a>.</p> <div class=3D"footer"> <div class=3D"footer_right"></div> </div> Modified: trunk/website/contact.php URL: http://svn.licq.org/viewvc/licq/trunk/website/contact.php?rev=3D4595&r= 1=3D4594&r2=3D4595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/contact.php (original) +++ trunk/website/contact.php Mon Sep 4 19:27:28 2006 @@ -10,7 +10,7 @@ =20 <!-- News Item Begin--> <div class=3D"news"> - <p>Before submitting feature requests, or if you are curious= about upcoming features or want to help with Licq, see the <a href=3D"http= ://sourceforge.net/pm/?group_id=3D254" >task manager</a>.</p> + <p>Before submitting feature requests, or if you are curious= about upcoming features or want to help with Licq, see the <a href=3D"http= ://trac.licq.org/query?status=3Dnew&status=3Dassigned&status=3Dreop= ened&type=3Denhancement&type=3Dtask&order=3Did">task manager</a= >=2E</p> <ul> <li><strong>Jon Keating</strong> (<a href=3D"mailto:jon@li= cq.org">jo...@li...</a>): Primary Licq Developer.</li> <li><strong>Dirk Mueller</strong> (<a href=3D"mailto:dirk@= licq.org">di...@li...</a>): Primary Licq Developer.</li> Modified: trunk/website/footer.php URL: http://svn.licq.org/viewvc/licq/trunk/website/footer.php?rev=3D4595&r1= =3D4594&r2=3D4595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/footer.php (original) +++ trunk/website/footer.php Mon Sep 4 19:27:28 2006 @@ -6,7 +6,7 @@ <div class=3D"menu_item"><a href=3D"/news.php"><span>News</span>= </a></div> <div class=3D"menu_item"><a href=3D"/info.php"><span>Info</span>= </a></div> <div class=3D"menu_item"><a href=3D"http://blog.licq.org"><span>= Blog</span></a></div> - <div class=3D"menu_item"><a href=3D"http://wiki.licq.org"><span>= Wiki</span></a></div> + <div class=3D"menu_item"><a href=3D"http://trac.licq.org"><span>= Wiki</span></a></div> <div class=3D"menu_item"><a href=3D"/mirrors.php"><span>Mirrors<= /span></a></div> <div class=3D"menu_item"><a href=3D"/help.php"><span>Help</span>= </a></div> <div class=3D"menu_item"><a href=3D"/download.php"><span>Downloa= ds</span></a></div> Modified: trunk/website/index.php URL: http://svn.licq.org/viewvc/licq/trunk/website/index.php?rev=3D4595&r1= =3D4594&r2=3D4595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/index.php (original) +++ trunk/website/index.php Mon Sep 4 19:27:28 2006 @@ -18,7 +18,7 @@ <div id=3D"maincontent"> <div id=3D"subcontent"> <h2>Welcome to the Licq homepage.</h2> - <p>Latest Update: <b>October 21, 2005</b><br />Stable Version:= <b>1.3.2</b><br />Devel Version: <b>1.3.2</b></p> + <p>Latest Update: <b>October 21, 2005</b><br />Stable Version:= <b>1.3.2</b><br />Devel Version: <b>1.3.4 RC1</b></p> =20 <a href=3D"http://sourceforge.net/donate/index.php?group_id=3D254"><img sr= c=3D"http://images.sourceforge.net/images/project-support.jpg" width=3D"88"= height=3D"32" border=3D"0" alt=3D"Support This Project" /> </a> <?=20 Added: trunk/website/news/47 URL: http://svn.licq.org/viewvc/licq/trunk/website/news/47?rev=3D4595&view= =3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/news/47 (added) +++ trunk/website/news/47 Mon Sep 4 19:27:28 2006 @@ -1,0 +1,12 @@ +2006-08-20 00:49 +Licq 1.3.4 Release Candidate 1 +Many bugs have been removed and new features have been added, so its that = time for a new release! So, I am announcing Release Candidate 1 for testing= . If you find any bugs, please create a new ticket at <a href=3D"http://tra= c=2Elicq.org/">http://trac.licq.org</a>. + +Here are the 2 URLs for RC1: +<ul> +<li><a href=3D"http://www.fanfic.org/~jon/licq-1.3.4-RC1.tar.bz2">http://w= ww.fanfic.org/~jon/licq-1.3.4-RC1.tar.bz2</a></li> +<li><a href=3D"http://www.fanfic.org/~jon/licq-1.3.4-RC1.tar.gz">http://ww= w=2Efanfic.org/~jon/licq-1.3.4-RC1.tar.gz</a></li> +</ul> + +The release notes can be found here: +<a href=3D"http://trac.licq.org/wiki/DeveloperArea/ReleaseNotes/1.3.4">htt= p://trac.licq.org/wiki/DeveloperArea/ReleaseNotes/1.3.4</a> Modified: trunk/website/news/last_id URL: http://svn.licq.org/viewvc/licq/trunk/website/news/last_id?rev=3D4595&= r1=3D4594&r2=3D4595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/website/news/last_id (original) +++ trunk/website/news/last_id Mon Sep 4 19:27:28 2006 @@ -1,1 +1,1 @@ -46 +47 |
From: <em...@us...> - 2006-09-03 07:19:02
|
Author: emostar Date: Sun Sep 3 09:18:31 2006 New Revision: 4594 URL: http://svn.licq.org/viewvc/licq?rev=3D4594&view=3Drev Log: Remove some debug output Modified: trunk/licq/src/icqd-srv.cpp Modified: trunk/licq/src/icqd-srv.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/icqd-srv.cpp?rev=3D4594= &r1=3D4593&r2=3D4594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/icqd-srv.cpp (original) +++ trunk/licq/src/icqd-srv.cpp Sun Sep 3 09:18:31 2006 @@ -4025,7 +4025,6 @@ nPacketCount =3D packet.UnpackUnsignedShortBE(); nCount +=3D nPacketCount; =20 - gLog.Info(tr("Total Number: %d\n"), nPacketCount); for (unsigned short i =3D 0; i < nPacketCount; i++) { char *szId; @@ -4037,9 +4036,6 @@ nID =3D packet.UnpackUnsignedShortBE(); nType =3D packet.UnpackUnsignedShortBE(); nByteLen =3D packet.UnpackUnsignedShortBE(); - - if (i < 150) - gLog.Info(tr("Number: %d, ID: %s\n"), i+1, szId); =20 char *szUnicodeName =3D gTranslator.FromUnicode(szId); =20 |
From: <em...@us...> - 2006-09-03 06:49:57
|
Author: emostar Date: Sun Sep 3 08:40:54 2006 New Revision: 4593 URL: http://svn.licq.org/viewvc/licq?rev=3D4593&view=3Drev Log: Fix downloading contacts from the server list. There is an unknown SSI type of 0x19 that I get for some users on my list a= nd some not on my list. It will need to be checked later. Modified: trunk/licq/include/licq_icqd.h trunk/licq/src/icqd-srv.cpp trunk/licq/src/icqd.cpp Modified: trunk/licq/include/licq_icqd.h URL: http://svn.licq.org/viewvc/licq/trunk/licq/include/licq_icqd.h?rev=3D4= 593&r1=3D4592&r2=3D4593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/include/licq_icqd.h (original) +++ trunk/licq/include/licq_icqd.h Sun Sep 3 08:40:54 2006 @@ -757,6 +757,7 @@ ICQEvent *DoneExtendedServerEvent(const unsigned short, EventResult); ICQEvent *DoneExtendedEvent(ICQEvent *, EventResult); ICQEvent *DoneExtendedEvent(unsigned long tag, EventResult _eResult); + bool hasServerEvent(unsigned long); void ProcessDoneEvent(ICQEvent *); void PushExtendedEvent(ICQEvent *); void PushPluginSignal(CICQSignal *); Modified: trunk/licq/src/icqd-srv.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/icqd-srv.cpp?rev=3D4593= &r1=3D4592&r2=3D4593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/icqd-srv.cpp (original) +++ trunk/licq/src/icqd-srv.cpp Sun Sep 3 08:40:54 2006 @@ -2304,7 +2304,7 @@ =20 gLog.Info(tr("%sRequesting list.\n"), L_SRVxSTR); p =3D new CPU_RequestList(); - SendEvent_Server(p); + SendExpectEvent_Server(0, p, NULL); =20 gLog.Info(tr("%sRequesting location rights.\n"), L_SRVxSTR); p =3D new CPU_GenericFamily(ICQ_SNACxFAM_LOCATION, ICQ_SNACxLOC_REQU= ESTxRIGHTS); @@ -3962,7 +3962,7 @@ //--------ProcessListFam-------------------------------------------- void CICQDaemon::ProcessListFam(CBuffer &packet, unsigned short nSubtype) { - /*unsigned short nFlags =3D */packet.UnpackUnsignedShortBE(); + unsigned short nFlags =3D packet.UnpackUnsignedShortBE(); unsigned long nSubSequence =3D packet.UnpackUnsignedLongBE(); =20 // First 8 bytes - unknown @@ -3989,29 +3989,43 @@ unsigned short nPacketCount; unsigned long nTime; =20 - ICQEvent *e =3D DoneServerEvent(nSubSequence, EVENT_SUCCESS); - - if (e =3D=3D NULL) - { - gLog.Warn(tr("%sContact list without request.\n"), L_SRVxSTR); - break; - } - - if (e->SNAC() =3D=3D MAKESNAC(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_REQUE= STxRIGHTS) || - e->SNAC() =3D=3D MAKESNAC(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_REQUE= STxROST)) - { - packet.UnpackUnsignedLong(); - packet.UnpackUnsignedLong(); - } - - gLog.Info(tr("%sReceived contact list.\n"), L_SRVxSTR); + if (nFlags & 0x0001) + { + if (!hasServerEvent(nSubSequence)) + gLog.Warn(tr("%sContact list without request.\n"), L_SRVxSTR); + else + gLog.Info(tr("%sReceived contact list.\n"), L_SRVxSTR); + } + else + { + // This is the last packet so mark it as done + ICQEvent *e =3D DoneServerEvent(nSubSequence, EVENT_SUCCESS); + + if (e =3D=3D NULL) + { + gLog.Warn(tr("%sContact list without request.\n"), L_SRVxSTR); + break; + } + + /* This isn't used anymore. At least with SSI Version 0. + if (e->SNAC() =3D=3D MAKESNAC(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_REQ= UESTxRIGHTS) || + e->SNAC() =3D=3D MAKESNAC(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_REQ= UESTxROST)) + { + packet.UnpackUnsignedLong(); + packet.UnpackUnsignedLong(); + } + */ + + gLog.Info(tr("%sReceived end of contact list.\n"), L_SRVxSTR); + } =20 m_bOnlineNotifies =3D true; =20 - packet.UnpackChar(); // unknown + packet.UnpackChar(); // SSI Version nPacketCount =3D packet.UnpackUnsignedShortBE(); nCount +=3D nPacketCount; =20 + gLog.Info(tr("Total Number: %d\n"), nPacketCount); for (unsigned short i =3D 0; i < nPacketCount; i++) { char *szId; @@ -4024,6 +4038,9 @@ nType =3D packet.UnpackUnsignedShortBE(); nByteLen =3D packet.UnpackUnsignedShortBE(); =20 + if (i < 150) + gLog.Info(tr("Number: %d, ID: %s\n"), i+1, szId); + char *szUnicodeName =3D gTranslator.FromUnicode(szId); =20 if (nByteLen) @@ -4031,7 +4048,7 @@ if (!packet.readTLV(-1, nByteLen)) { gLog.Error("%sUnable to parse contact list TLV, aborting!\n", - L_ERRORxSTR); + L_ERRORxSTR); delete[] szId; return; } @@ -4161,6 +4178,11 @@ // LIST_ALL, 0)); //} } + else + { + gLog.Info(tr("%sGot Master Group record.\n"), L_SRVxSTR); + } + break; } =20 Modified: trunk/licq/src/icqd.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/icqd.cpp?rev=3D4593&r1= =3D4592&r2=3D4593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/icqd.cpp (original) +++ trunk/licq/src/icqd.cpp Sun Sep 3 08:40:54 2006 @@ -1595,6 +1595,27 @@ } while (e !=3D NULL); } =20 +/** + * Search the running event queue for a specific event by subsequence. + */ +bool CICQDaemon::hasServerEvent(unsigned long _nSubSequence) +{ + bool hasEvent =3D false; + pthread_mutex_lock(&mutex_runningevents); + list<ICQEvent *>::iterator iter; + for (iter =3D m_lxRunningEvents.begin(); iter !=3D m_lxRunningEvents.end= (); ++iter) + { + if ((*iter)->CompareSubSequence(_nSubSequence)) + { + hasEvent =3D true; + break; + } + } + + pthread_mutex_unlock(&mutex_runningevents); + return hasEvent; +} +=20 =20 //---DoneSrvEvent---------------------------------------------------------= ----- /*! \brief Marks the given event as done. |
From: <er...@us...> - 2006-09-02 21:53:42
|
Author: erijo Date: Sat Sep 2 23:53:25 2006 New Revision: 4592 URL: http://svn.licq.org/viewvc/licq?rev=3D4592&view=3Drev Log: Applied patch by root_42 (#1387) to fix some compiler warnings. Modified: trunk/qt-gui/src/editgrp.cpp trunk/qt-gui/src/usereventdlg.cpp Modified: trunk/qt-gui/src/editgrp.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/editgrp.cpp?rev=3D459= 2&r1=3D4591&r2=3D4592&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/editgrp.cpp (original) +++ trunk/qt-gui/src/editgrp.cpp Sat Sep 2 23:53:25 2006 @@ -166,7 +166,7 @@ if (n < 0 /* || n =3D=3D max */) return; gUserManager.SwapGroups(n + 1, n + 2); RefreshList(); - if (n + 2 >=3D lstGroups->count()) + if (n + 2 >=3D int(lstGroups->count())) lstGroups->setCurrentItem(lstGroups->count() - 1); else lstGroups->setCurrentItem(n + 2); Modified: trunk/qt-gui/src/usereventdlg.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/usereventdlg.cpp?rev= =3D4592&r1=3D4591&r2=3D4592&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/usereventdlg.cpp (original) +++ trunk/qt-gui/src/usereventdlg.cpp Sat Sep 2 23:53:25 2006 @@ -99,7 +99,7 @@ using std::pair; using std::make_pair; =20 -const int SHOW_RECENT_NUM =3D 5; +const size_t SHOW_RECENT_NUM =3D 5; =20 // -----------------------------------------------------------------------= ------ UserEventCommon::UserEventCommon(CICQDaemon *s, CSignalManager *theSigMan, @@ -1620,7 +1620,7 @@ // Make sure we don't show the new messages waiting. unsigned short nNewMessages =3D u->NewMessages(); HistoryListIter lHistoryIter =3D lHistoryList.end(); - for (int i =3D 0; i < (SHOW_RECENT_NUM + nNewMessages) && lHistory= Iter !=3D lHistoryList.begin(); i++) + for (size_t i =3D 0; i < (SHOW_RECENT_NUM + nNewMessages) && lHist= oryIter !=3D lHistoryList.begin(); i++) lHistoryIter--; =20 bool bUseHTML =3D !isdigit((m_lUsers.front().c_str())[1]);=20 |
From: <er...@us...> - 2006-09-02 21:52:48
|
Author: erijo Date: Sat Sep 2 23:52:19 2006 New Revision: 4591 URL: http://svn.licq.org/viewvc/licq?rev=3D4591&view=3Drev Log: Applied patch from root_42 (#1387) to fix some compiler warnings. Modified: trunk/licq/include/licq_message.h trunk/licq/src/icqd-srv.cpp trunk/licq/src/user.cpp Modified: trunk/licq/include/licq_message.h URL: http://svn.licq.org/viewvc/licq/trunk/licq/include/licq_message.h?rev= =3D4591&r1=3D4590&r2=3D4591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/include/licq_message.h (original) +++ trunk/licq/include/licq_message.h Sat Sep 2 23:52:19 2006 @@ -54,7 +54,7 @@ unsigned short LicqVersion() { return m_nFlags & E_LICQxVER; } direction Direction() { return m_eDir; } CICQColor *Color() { return &m_sColor; } - int ConvoId() { return m_nConvoId; } + unsigned long ConvoId() { return m_nConvoId; } =20 bool Pending() { return m_bPending; } void SetPending(bool b) { m_bPending =3D b; } Modified: trunk/licq/src/icqd-srv.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/icqd-srv.cpp?rev=3D4591= &r1=3D4590&r2=3D4591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/icqd-srv.cpp (original) +++ trunk/licq/src/icqd-srv.cpp Sat Sep 2 23:52:19 2006 @@ -2287,9 +2287,9 @@ =20 case ICQ_SNACxSRV_ACKxIMxICQ: { - ICQOwner *o =3D gUserManager.FetchOwner(LICQ_PPID, LOCK_R); - unsigned long nListTime =3D o->GetSSTime(); - gUserManager.DropOwner(LICQ_PPID); + // ICQOwner *o =3D gUserManager.FetchOwner(LICQ_PPID, LOCK_R); + // unsigned long nListTime =3D o->GetSSTime(); + // gUserManager.DropOwner(LICQ_PPID); =20 CSrvPacketTcp* p; gLog.Info(tr("%sServer sent us channel capability list (ignoring).\n= "), L_SRVxSTR); Modified: trunk/licq/src/user.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/user.cpp?rev=3D4591&r1= =3D4590&r2=3D4591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/user.cpp (original) +++ trunk/licq/src/user.cpp Sat Sep 2 23:52:19 2006 @@ -2792,7 +2792,6 @@ bool bLeft =3D false; unsigned long i =3D 0, j, nField =3D 0, nPos =3D 0; char szTemp[128]; - const char *sz; =20 // Our secure string for escaping stuff bool bSecure =3D (_szFormat[0] =3D=3D '|' && (nFlags & USPRINTF_PIPEISCM= D)) || @@ -2854,6 +2853,7 @@ } } =20 + const char *sz =3D 0; switch(_szFormat[i]) { case 'i': @@ -3026,6 +3026,9 @@ break; } =20 + if (!sz) + continue; + // If we need to be secure, then quote the % string if (bSecure) { |
From: <er...@us...> - 2006-09-01 15:53:24
|
Author: erijo Date: Fri Sep 1 17:49:46 2006 New Revision: 4590 URL: http://svn.licq.org/viewvc/licq?rev=3D4590&view=3Drev Log: Commit part of the patch from Danil Krivopustov (#1386: Can't get the passp= hrase from licq_gpg.conf). I'm not adding the part that would trim the pass= word since that might break the passphrase for current users. As long as yo= ur password doesn't start or end with space, this should work. Closes #1386. Modified: trunk/licq/src/gpg.cpp Modified: trunk/licq/src/gpg.cpp URL: http://svn.licq.org/viewvc/licq/trunk/licq/src/gpg.cpp?rev=3D4590&r1= =3D4589&r2=3D4590&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/src/gpg.cpp (original) +++ trunk/licq/src/gpg.cpp Fri Sep 1 17:49:46 2006 @@ -153,7 +153,7 @@ mKeysIni.LoadFile(buf); =20 mKeysIni.SetSection("gpg"); - mKeysIni.ReadStr("passphrase", buf); mGPGPassphrase =3D strdup(buf); + mKeysIni.ReadStr("passphrase", buf, ""); mGPGPassphrase =3D strdup(buf); =20 const char *gpgme_ver =3D gpgme_check_version(0); gLog.Info("%s[GPG] gpgme library found: %s\n", L_INITxSTR, gpgme_ver); |
From: <er...@us...> - 2006-08-30 12:45:17
|
Author: erijo Date: Wed Aug 30 14:39:13 2006 New Revision: 4589 URL: http://svn.licq.org/viewvc/licq?rev=3D4589&view=3Drev Log: Refactored CUserView::viewportDropEvent by moving common code introduced in= r4587 to a new function. Also rewrote the drag&drop behaviour for contacts= to work with all protocols. Modified: trunk/qt-gui/src/userbox.cpp Modified: trunk/qt-gui/src/userbox.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/userbox.cpp?rev=3D458= 9&r1=3D4588&r2=3D4589&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/userbox.cpp (original) +++ trunk/qt-gui/src/userbox.cpp Wed Aug 30 14:39:13 2006 @@ -42,6 +42,7 @@ #include "usereventdlg.h" #include "usercodec.h" =20 +#include "licq_icqd.h" #include "licq_user.h" #include "licq_socket.h" =20 @@ -1182,6 +1183,68 @@ e->accept(QTextDrag::canDecode(e) || QUriDrag::canDecode(e)); } =20 +/** + * Get a pointer to a dialog for sending events with the given @a type, to= the contact + * @a szId over the protocol @a nPPID. If the dialog is already open, the = dialog is + * converted to the correct type before being returned. + * + * @returns a pointer to a send event dialog of type @a T, or NULL on erro= r=2E + */ +template<typename T> +static T* getSendEventDialog(UserEventCommon::type type, const char *szId,= unsigned long nPPID) +{ + int function; + if (type =3D=3D UserEventCommon::UC_CONTACT) + function =3D mnuUserSendContact; + else if (type =3D=3D UserEventCommon::UC_FILE) + function =3D mnuUserSendFile; + else if (type =3D=3D UserEventCommon::UC_MESSAGE) + function =3D mnuUserSendMsg; + else if (type =3D=3D UserEventCommon::UC_URL) + function =3D mnuUserSendUrl; + else + return NULL; + + UserEventCommon *common =3D gMainWindow->callFunction(function, szId, nP= PID); + if (!common) + return NULL; + + T *dialog =3D dynamic_cast<T *>(common); + if (!dialog) + { + UserSendCommon *base =3D dynamic_cast<UserSendCommon *>(common); + if (!base) + return NULL; + + base->changeEventType(type); + dialog =3D dynamic_cast<T *>(gMainWindow->callFunction(function, szId,= nPPID)); + if (!dialog) + return NULL; + } + + return dialog; +} + +/// Convenient, wrapper functions for getSendEventDialog. +static inline UserSendContactEvent* getSendContactEventDialog(const char *= szId, unsigned long nPPID) +{ + return getSendEventDialog<UserSendContactEvent>(UserEventCommon::UC_CONT= ACT, szId, nPPID); +} + +static inline UserSendFileEvent* getSendFileEventDialog(const char *szId, = unsigned long nPPID) +{ + return getSendEventDialog<UserSendFileEvent>(UserEventCommon::UC_FILE, s= zId, nPPID); +} + +static inline UserSendMsgEvent* getSendMsgEventDialog(const char *szId, un= signed long nPPID) +{ + return getSendEventDialog<UserSendMsgEvent>(UserEventCommon::UC_MESSAGE,= szId, nPPID); +} + +static inline UserSendUrlEvent* getSendUrlEventDialog(const char *szId, un= signed long nPPID) +{ + return getSendEventDialog<UserSendUrlEvent>(UserEventCommon::UC_URL, szI= d, nPPID); +} =20 void CUserView::viewportDropEvent(QDropEvent* e) { @@ -1190,153 +1253,126 @@ e->ignore(); =20 CUserViewItem* it =3D static_cast<CUserViewItem*>(itemAt(e->pos())); - - if (it) - { - if (it->ItemId()) - { - QString text; - QStrList lst; - if (QUriDrag::decode(e, lst)) - { - QStrListIterator strIter(lst); - if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) + if (!it) + return; + + if (it->ItemId()) + { + QString text; + QStrList lst; + if (QUriDrag::decode(e, lst)) + { + QStrListIterator strIter(lst); + if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) + { + UserSendFileEvent *sendFile =3D getSendFileEventDialog(it->ItemId(= ), it->ItemPPID()); + if (!sendFile) + return; + + sendFile->setFile(text, QString::null); + + // Add all the files + while (strIter !=3D lst.getLast()) { - UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> - (gMainWindow->callFunction(mnuUserSendFile, it->ItemId(), it= ->ItemPPID())); - if (!basePtr) - return; - - UserSendFileEvent *sendFile; - if (!(sendFile =3D dynamic_cast<UserSendFileEvent *>(basePtr))) - { - basePtr->changeEventType(UserEventCommon::UC_FILE); - sendFile =3D dynamic_cast<UserSendFileEvent *> - (gMainWindow->callFunction(mnuUserSendFile, it->ItemId(), = it->ItemPPID())); - if (!sendFile) - return; - } - - sendFile->setFile(text, QString::null); - - // Add all the files - while (strIter !=3D lst.getLast()) - { - ++strIter; - if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) - sendFile->addFile(text); - } - - sendFile->show(); + ++strIter; + if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) + sendFile->addFile(text); } - else + + sendFile->show(); + } + else + { + UserSendUrlEvent *sendUrl =3D getSendUrlEventDialog(it->ItemId(), = it->ItemPPID()); + if (!sendUrl) + return; + + sendUrl->setUrl(QString(strIter), QString::null); + sendUrl->show(); + } + } + + else if (QTextDrag::decode(e, text)) + { + unsigned long nPPID =3D 0; + FOR_EACH_PROTO_PLUGIN_START(gMainWindow->licqDaemon) + { + if (text.startsWith(PPIDSTRING((*_ppit)->PPID()))) { - UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> - (gMainWindow->callFunction(mnuUserSendUrl, it->ItemId(),it->= ItemPPID())); - if (!basePtr) - return; - - UserSendUrlEvent *sendUrl; - if (!(sendUrl =3D dynamic_cast<UserSendUrlEvent *>(basePtr))) - { - basePtr->changeEventType(UserSendCommon::UC_URL); - sendUrl =3D dynamic_cast<UserSendUrlEvent *> - (gMainWindow->callFunction(mnuUserSendUrl, it->ItemId(),it= ->ItemPPID())); - if (!sendUrl) - return; - } - - sendUrl->setUrl(QString(strIter), QString::null); - sendUrl->show(); + nPPID =3D (*_ppit)->PPID(); + break; } } - - //TODO change this - else if (QTextDrag::decode(e, text)) - { -// const char *p =3D (text.left(4).latin1()); - char *szId =3D strdup((text.mid(4, text.length() - 4).latin1())); - unsigned long nPPID =3D LICQ_PPID; //TODO fix this - - if (szId) + FOR_EACH_PROTO_PLUGIN_END; + + if (nPPID && text.length() > 4) + { + char *szId =3D strdup(text.mid(4).latin1()); + if (strcmp(szId, it->ItemId()) =3D=3D 0 && nPPID =3D=3D it->ItemPP= ID()) { - if (strcmp(szId, it->ItemId()) =3D=3D 0 && nPPID =3D=3D it->Item= PPID()) - { - free(szId); - return; - } - - UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> - (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(),= it->ItemPPID())); - if (!basePtr) - { - free(szId); - return; - } - - UserSendContactEvent* sendContact; - if (!(sendContact =3D dynamic_cast<UserSendContactEvent *>(baseP= tr))) - { - basePtr->changeEventType(UserSendCommon::UC_CONTACT); - sendContact =3D dynamic_cast<UserSendContactEvent *> - (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(= ), it->ItemPPID())); - if (!sendContact) - { - free(szId); - return; - } - } - - ICQUser* u =3D gUserManager.FetchUser(szId, nPPID, LOCK_R); - QString alias =3D u ? u->GetAlias() : ""; - gUserManager.DropUser(u); - - sendContact->setContact(szId, nPPID, alias); - sendContact->show(); + free(szId); + return; } - else // if (szId) + + UserSendContactEvent* sendContact =3D getSendContactEventDialog(it= ->ItemId(), it->ItemPPID()); + if (!sendContact) { - UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> - (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), it-= >ItemPPID())); - if (!basePtr) - return; - - UserSendMsgEvent* sendMsg; - if (!(sendMsg =3D dynamic_cast<UserSendMsgEvent *>(basePtr))) - { - basePtr->changeEventType(UserSendCommon::UC_MESSAGE); - sendMsg =3D dynamic_cast<UserSendMsgEvent *> - (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), i= t->ItemPPID())); - if (!sendMsg) - return; - } - - sendMsg->setText(text); - sendMsg->show(); + free(szId); + return; } =20 - free (szId); - } - } - //TODO Change this - else if (it->isGroupItem()) - { - QString text; - if (QTextDrag::decode(e, text)) - { -// const char *p =3D (text.left(4).latin1()); - char *szId =3D strdup(text.mid(4, text.length() - 4).latin1()); - unsigned long nPPID =3D LICQ_PPID; //TODO Fix this - - if (szId) + ICQUser* u =3D gUserManager.FetchUser(szId, nPPID, LOCK_R); + QString alias =3D u ? u->GetAlias() : ""; + gUserManager.DropUser(u); + + sendContact->setContact(szId, nPPID, alias); + sendContact->show(); + + free(szId); + } + else + { + UserSendMsgEvent* sendMsg =3D getSendMsgEventDialog(it->ItemId(), = it->ItemPPID()); + if (!sendMsg) + return; + + sendMsg->setText(text); + sendMsg->show(); + } + } + } + + else if (it->isGroupItem()) + { + QString text; + if (QTextDrag::decode(e, text) && text.length() > 4) + { + unsigned long nPPID =3D 0; + FOR_EACH_PROTO_PLUGIN_START(gMainWindow->licqDaemon) + { + if (text.startsWith(PPIDSTRING((*_ppit)->PPID()))) { - gUserManager.AddUserToGroup(szId, nPPID, it->GroupId()); - gMainWindow->updateUserWin(); + nPPID =3D (*_ppit)->PPID(); + break; } - - free(szId); - } - } + } + FOR_EACH_PROTO_PLUGIN_END; + + if (nPPID =3D=3D 0) + return; + + char *szId =3D strdup(text.mid(4).latin1()); + + if (szId) + { + gUserManager.AddUserToGroup(szId, nPPID, it->GroupId()); + gMainWindow->updateUserWin(); + } + + free(szId); + } + else + return; // Not accepted } =20 e->accept(); @@ -1361,7 +1397,8 @@ CUserViewItem* item =3D static_cast<CUserViewItem*>(currentItem()); if(item =3D=3D NULL) return; =20 - if(item->isGroupItem()) { + if(item->isGroupItem()) + { setOpen(item, !item->isOpen()); return; } @@ -1392,7 +1429,8 @@ =20 QListViewItemIterator it(this); QListViewItem* lastitem =3D 0; - while(it.current() !=3D NULL) { + while(it.current() !=3D NULL) + { lastitem =3D it.current(); ++it; } @@ -1410,18 +1448,18 @@ if (m_typePos > 0) { m_typeAhead.truncate(m_typeAhead.length()-1); - m_typePos--; + m_typePos--; } /* fall through */ - =20 + default: { int ascii =3D tolower(e->ascii()); if (!isalnum(ascii) && e->key() !=3D Key_Backspace) { QListView::keyPressEvent(e); - m_typeAhead =3D ""; - m_typePos =3D 0 ; + m_typeAhead =3D ""; + m_typePos =3D 0 ; return; } =20 @@ -1429,20 +1467,18 @@ m_typePos++; =20 QListViewItemIterator it(firstChild()); - =20 + while (it.current() !=3D NULL) { CUserViewItem* item =3D static_cast<CUserViewItem*>(it.current()); + if (item->text(1).lower().startsWith(m_typeAhead)) { - if (item->text(1).lower().startsWith(m_typeAhead)) - { - setSelected(item, true); - ensureItemVisible(item); - item->repaint(); - return; - } - ++it; + setSelected(item, true); + ensureItemVisible(item); + item->repaint(); + return; } + ++it; } =20 // If we are here we didn't find any names |
From: <er...@us...> - 2006-08-29 19:44:22
|
Author: erijo Date: Tue Aug 29 21:44:15 2006 New Revision: 4588 URL: http://svn.licq.org/viewvc/licq?rev=3D4588&view=3Drev Log: Fix compiler warning: dereferencing type-punned pointer will break strict-a= liasing rules.=20 Modified: trunk/console/src/console_print.cpp Modified: trunk/console/src/console_print.cpp URL: http://svn.licq.org/viewvc/licq/trunk/console/src/console_print.cpp?re= v=3D4588&r1=3D4587&r2=3D4588&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/console/src/console_print.cpp (original) +++ trunk/console/src/console_print.cpp Tue Aug 29 21:44:15 2006 @@ -580,8 +580,7 @@ char buf[32]; char szPort[32]; char szRealIp[32]; - const unsigned long nRealIp =3D u->RealIp(); - strcpy(szRealIp, inet_ntoa_r(*(struct in_addr *)&nRealIp, buf)); + strcpy(szRealIp, ip_ntoa(u->RealIp(), buf)); time_t nLast =3D u->LastOnline(); time_t nOnSince =3D u->OnlineSince(); =20 |
From: <er...@us...> - 2006-08-29 19:21:44
|
Author: erijo Date: Tue Aug 29 21:21:33 2006 New Revision: 4587 URL: http://svn.licq.org/viewvc/licq?rev=3D4587&view=3Drev Log: Don't crash on drag&drop if there already is a chat window opened. Closes #= 1368. The bug was that the pointer to the existing chat window was casted (static= _cast) to a specific class (e.g. the send file dialog class). But if the ch= at window was already open the pointer could be pointing to a sibling class= (e.g. the send message dialog class) and this resulted in a crash. Now we use dynamic_cast instead, and if it fails, we try to change the dial= og type to match that that was dragged&dropped. Modified: trunk/qt-gui/src/userbox.cpp Modified: trunk/qt-gui/src/userbox.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/userbox.cpp?rev=3D458= 7&r1=3D4586&r2=3D4587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/userbox.cpp (original) +++ trunk/qt-gui/src/userbox.cpp Tue Aug 29 21:21:33 2006 @@ -1185,81 +1185,151 @@ =20 void CUserView::viewportDropEvent(QDropEvent* e) { + // We ignore the event per default and then accept it if we + // get to the end of this function. + e->ignore(); + CUserViewItem* it =3D static_cast<CUserViewItem*>(itemAt(e->pos())); =20 - if(it) + if (it) { if (it->ItemId()) { QString text; QStrList lst; - if(QUriDrag::decode(e, lst)) + if (QUriDrag::decode(e, lst)) { QStrListIterator strIter(lst); - if(!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) + if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) { - UserSendFileEvent *e =3D static_cast<UserSendFileEvent *> - (gMainWindow->callFunction(mnuUserSendFile, it->ItemId(), - it->ItemPPID())); - e->setFile(text, QString::null); - =20 + UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> + (gMainWindow->callFunction(mnuUserSendFile, it->ItemId(), it= ->ItemPPID())); + if (!basePtr) + return; + + UserSendFileEvent *sendFile; + if (!(sendFile =3D dynamic_cast<UserSendFileEvent *>(basePtr))) + { + basePtr->changeEventType(UserEventCommon::UC_FILE); + sendFile =3D dynamic_cast<UserSendFileEvent *> + (gMainWindow->callFunction(mnuUserSendFile, it->ItemId(), = it->ItemPPID())); + if (!sendFile) + return; + } + + sendFile->setFile(text, QString::null); + // Add all the files while (strIter !=3D lst.getLast()) { ++strIter; if (!(text =3D QUriDrag::uriToLocalFile(strIter)).isEmpty()) - e->addFile(text); + sendFile->addFile(text); } - =20 - e->show(); + + sendFile->show(); } else { - UserSendUrlEvent *e =3D static_cast<UserSendUrlEvent *> - (gMainWindow->callFunction(mnuUserSendUrl, it->ItemId(), - it->ItemPPID())); - e->setUrl(text, QString::null); - e->show(); + UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> + (gMainWindow->callFunction(mnuUserSendUrl, it->ItemId(),it->= ItemPPID())); + if (!basePtr) + return; + + UserSendUrlEvent *sendUrl; + if (!(sendUrl =3D dynamic_cast<UserSendUrlEvent *>(basePtr))) + { + basePtr->changeEventType(UserSendCommon::UC_URL); + sendUrl =3D dynamic_cast<UserSendUrlEvent *> + (gMainWindow->callFunction(mnuUserSendUrl, it->ItemId(),it= ->ItemPPID())); + if (!sendUrl) + return; + } + + sendUrl->setUrl(QString(strIter), QString::null); + sendUrl->show(); } } - =20 + //TODO change this - else if(QTextDrag::decode(e, text)) { + else if (QTextDrag::decode(e, text)) + { // const char *p =3D (text.left(4).latin1()); char *szId =3D strdup((text.mid(4, text.length() - 4).latin1())); unsigned long nPPID =3D LICQ_PPID; //TODO fix this =20 - if(szId) { - if(strcmp(szId, it->ItemId()) =3D=3D 0 && nPPID =3D=3D it->ItemP= PID()) return; - UserSendContactEvent* e =3D static_cast<UserSendContactEvent*> - (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(), i= t->ItemPPID())); + if (szId) + { + if (strcmp(szId, it->ItemId()) =3D=3D 0 && nPPID =3D=3D it->Item= PPID()) + { + free(szId); + return; + } + + UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> + (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(),= it->ItemPPID())); + if (!basePtr) + { + free(szId); + return; + } + + UserSendContactEvent* sendContact; + if (!(sendContact =3D dynamic_cast<UserSendContactEvent *>(baseP= tr))) + { + basePtr->changeEventType(UserSendCommon::UC_CONTACT); + sendContact =3D dynamic_cast<UserSendContactEvent *> + (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(= ), it->ItemPPID())); + if (!sendContact) + { + free(szId); + return; + } + } + ICQUser* u =3D gUserManager.FetchUser(szId, nPPID, LOCK_R); QString alias =3D u ? u->GetAlias() : ""; gUserManager.DropUser(u); =20 - e->setContact(szId, nPPID, alias); - e->show(); + sendContact->setContact(szId, nPPID, alias); + sendContact->show(); } - else { - UserSendMsgEvent* e =3D static_cast<UserSendMsgEvent*> - (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), it->I= temPPID())); - e->setText(text); - e->show(); + else // if (szId) + { + UserSendCommon *basePtr =3D dynamic_cast<UserSendCommon *> + (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), it-= >ItemPPID())); + if (!basePtr) + return; + + UserSendMsgEvent* sendMsg; + if (!(sendMsg =3D dynamic_cast<UserSendMsgEvent *>(basePtr))) + { + basePtr->changeEventType(UserSendCommon::UC_MESSAGE); + sendMsg =3D dynamic_cast<UserSendMsgEvent *> + (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), i= t->ItemPPID())); + if (!sendMsg) + return; + } + + sendMsg->setText(text); + sendMsg->show(); } =20 free (szId); } } //TODO Change this - else if(it->isGroupItem()) + else if (it->isGroupItem()) { QString text; - if(QTextDrag::decode(e, text)) { + if (QTextDrag::decode(e, text)) + { // const char *p =3D (text.left(4).latin1()); char *szId =3D strdup(text.mid(4, text.length() - 4).latin1()); unsigned long nPPID =3D LICQ_PPID; //TODO Fix this =20 - if(szId) { + if (szId) + { gUserManager.AddUserToGroup(szId, nPPID, it->GroupId()); gMainWindow->updateUserWin(); } @@ -1268,6 +1338,8 @@ } } } + + e->accept(); } =20 =20 |
From: <er...@us...> - 2006-08-29 17:51:56
|
Author: erijo Date: Tue Aug 29 19:42:18 2006 New Revision: 4586 URL: http://svn.licq.org/viewvc/licq?rev=3D4586&view=3Drev Log: Close input and output files before trying to move them around, as this app= arently causes troubles on FreeBSD softupdates filesystem. Closes #175. Modified: trunk/licq/bin/licq.micqconvert Modified: trunk/licq/bin/licq.micqconvert URL: http://svn.licq.org/viewvc/licq/trunk/licq/bin/licq.micqconvert?rev=3D= 4586&r1=3D4585&r2=3D4586&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/bin/licq.micqconvert (original) +++ trunk/licq/bin/licq.micqconvert Tue Aug 29 19:42:18 2006 @@ -131,13 +131,13 @@ print TMP "User" . ($j + $initial_users + 1) . " =3D " . $contacts_list[$= j] . "\n"; } =20 =20 + close (IN); + close (TMP); + $system_commands =3D "cp $filename_tmp $filename; rm $filename_tmp"; system($system_commands) =3D=3D 0 or die "system() call failed: $?"; =20 print "Done.\n\n"; - =20 - close (IN); - close (TMP); } =20 =20 |
From: <er...@us...> - 2006-08-28 12:07:11
|
Author: erijo Date: Mon Aug 28 13:51:41 2006 New Revision: 4585 URL: http://svn.licq.org/viewvc/licq?rev=3D4585&view=3Drev Log: * Can't use %1 and %2 together with QString::arg() when constructing the url since it breaks down when the url itself contains %##. * Use \w instead of a-z0-9 in regexp. This way we allow non ascii chars in the url. Closes #1375. Modified: trunk/qt-gui/src/mlview.cpp Modified: trunk/qt-gui/src/mlview.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/mlview.cpp?rev=3D4585= &r1=3D4584&r2=3D4585&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/mlview.cpp (original) +++ trunk/qt-gui/src/mlview.cpp Mon Aug 28 13:51:41 2006 @@ -87,7 +87,7 @@ "(?:(https?|ftp)://(.+(:.+)?@)?|www\\d?\\.)" // protocoll://[user[:= password]@] or www[digit]. "[a-z0-9.-]+\\.([a-z]+|[0-9]+)" // hostname.tld or ip = address "(:[0-9]+)?" // optional port - "(/([-a-z0-9%{}|\\\\^~`;/?:@=3D&$_.+!*'(),#]|\\[|\\])*)?"); + "(/([-\\w%{}|\\\\^~`;/?:@=3D&$_.+!*'(),#]|\\[|\\])*)?"); reURL.setMinimal(false); reURL.setCaseSensitive(false); =20 @@ -114,7 +114,12 @@ { const QString url =3D reURL.cap(); const QString fullurl =3D (reURL.cap(1).isEmpty() ? QString("http:= //%1").arg(url) : url); - const QString link =3D QString("<a href=3D\"%1\">%2</a>").arg(full= url).arg(url); + + // Can't use QString("<a href=3D\"%1\">%2</a>").arg(fullurl).arg(u= rl) since it breaks + // down when fullurl contains urlencoded chars (%##). + const QString link =3D QString::fromLatin1("<a href=3D\"") + fullu= rl + QString::fromLatin1("\">") + + url + QString::fromLatin1("</a>"); + text.replace(urlPos, reURL.matchedLength(), link); pos =3D urlPos + link.length(); } @@ -122,7 +127,8 @@ { const QString mail =3D reMail.cap(); const QString fullmail =3D (reMail.cap(1).isEmpty() ? QString("mai= lto:%1").arg(mail) : mail); - const QString link =3D QString("<a href=3D\"%1\">%2</a>").arg(full= mail).arg(mail); + const QString link =3D QString::fromLatin1("<a href=3D\"") + fullm= ail + QString::fromLatin1("\">") + + mail + QString::fromLatin1("</a>"); text.replace(mailPos, reMail.matchedLength(), link); pos =3D mailPos + link.length(); } |
From: <em...@us...> - 2006-08-24 13:34:22
|
Author: emostar Date: Thu Aug 24 15:34:12 2006 New Revision: 4584 URL: http://svn.licq.org/viewvc/licq?rev=3D4584&view=3Drev Log: Use tab positions and ids. when a tab got closed, the id is lost which caus= ed bug #1366 Thanks to Eric for pointing this out. --This line, and those below, will be ignored-- M ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/ewidgets.cpp?rev=3D45= 84&r1=3D4583&r2=3D4584&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/ewidgets.cpp (original) +++ trunk/qt-gui/src/ewidgets.cpp Thu Aug 24 15:34:12 2006 @@ -489,20 +489,26 @@ =20 void CETabBar::setPreviousTab() { - int tab =3D currentTab() - 1; + if (currentTab() =3D=3D -1) + return; // No current tab + + int tab =3D indexOf(currentTab()) - 1; if (tab < 0) tab =3D count() - 1; =20 - setCurrentTab(tab); + setCurrentTab(tabAt(tab)); } =20 void CETabBar::setNextTab() { - int tab =3D currentTab() + 1; + if (currentTab() =3D=3D -1) + return; // No current tab + + int tab =3D indexOf(currentTab()) + 1; if (tab >=3D count()) tab =3D 0; =20 - setCurrentTab(tab); + setCurrentTab(tabAt(tab)); } =20 void CETabBar::paintLabel(QPainter* p, const QRect &br, |
From: <em...@us...> - 2006-08-24 12:56:16
|
Author: emostar Date: Thu Aug 24 14:55:57 2006 New Revision: 4583 URL: http://svn.licq.org/viewvc/licq?rev=3D4583&view=3Drev Log: Remove a few compiler warnings Make the message box be a dialog that is modal. --This line, and those below, will be ignored-- M ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp Modified: trunk/qt-gui/src/ewidgets.cpp URL: http://svn.licq.org/viewvc/licq/trunk/qt-gui/src/ewidgets.cpp?rev=3D45= 83&r1=3D4582&r2=3D4583&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/qt-gui/src/ewidgets.cpp (original) +++ trunk/qt-gui/src/ewidgets.cpp Thu Aug 24 14:55:57 2006 @@ -1104,7 +1104,7 @@ } =20 CLicqMessageBox::CLicqMessageBox(QWidget *parent) - : QDialog(0, "LicqInfo", false, WDestructiveClose), m_nUnreadNum(0) + : QDialog(parent, "LicqInfo", false, Qt::WType_Dialog|Qt::WShowModal), m= _nUnreadNum(0) { setCaption("Licq"); =20 @@ -1358,6 +1358,12 @@ case QMessageBox::Critical: strCaption =3D "Licq Critical"; break; + + case QMessageBox::NoIcon: + case QMessageBox::Question: + default: + strCaption =3D "Licq"; + break; } setCaption(strCaption); } |