cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport a fix for kopete/icq from the kde subversion repository.

Browse Source 
Fix bug 136566: Connecting to ICQ doesn't work anymore.

ok espie@
This commit is contained in:
bernd 2006-11-03 18:00:59 +00:00
parent 48f2311f8e
commit f0360a0dca
3 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde/network3/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.46 2006/10/12 23:12:19 espie Exp $
# $OpenBSD: Makefile,v 1.47 2006/11/03 18:00:59 bernd Exp $
COMMENT= "K Desktop Environment, network applications"
CATEGORIES= x11 x11/kde
VERSION= 3.5.5
DISTNAME= kdenetwork-${VERSION}
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
MODKDE_VERSION= 3.5.3
FLAVORS=debug
SHARED_LIBS= kopete 2.0 \

31
x11/kde/network3/patches/patch-kopete_protocols_oscar_liboscar_client_cpp Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-kopete_protocols_oscar_liboscar_client_cpp,v 1.1 2006/11/03 18:00:59 bernd Exp $
Backport SVN commit 600976 by rjarosz:
Fix bug 136566: Connecting to ICQ doesn't work anymore.
* OSCAR server stops sending own user info at logon, we have to send own
user info request like ICQ5.
* Fix bug when going online with any other status than online i.e. away,
n/a... Kopete indicates the account as online. The status on a server is
correct.
Should be fixed in kdenetwork >3.5.5.
--- kopete/protocols/oscar/liboscar/client.cpp.orig Thu Nov 2 13:12:58 2006
+++ kopete/protocols/oscar/liboscar/client.cpp Thu Nov 2 13:14:34 2006
@@ -397,9 +397,12 @@ void Client::serviceSetupFinished()
d->active = true;
if ( isIcq() )
- {
setStatus( d->connectAsStatus, d->connectWithMessage );
+ d->ownStatusTask->go();
+
+ if ( isIcq() )
+ {
//retrieve offline messages
Connection* c = d->connections.connectionForFamily( 0x0015 );
if ( !c )

26
x11/kde/network3/patches/patch-kopete_protocols_oscar_oscaraccount_cpp Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-kopete_protocols_oscar_oscaraccount_cpp,v 1.1 2006/11/03 18:00:59 bernd Exp $
Backport SVN commit 600976 by rjarosz:
Fix bug 136566: Connecting to ICQ doesn't work anymore.
* OSCAR server stops sending own user info at logon, we have to send own
user info request like ICQ5.
* Fix bug when going online with any other status than online i.e. away,
n/a... Kopete indicates the account as online. The status on a server is
correct.
Should be fixed in kdenetwork >3.5.5.
--- kopete/protocols/oscar/oscaraccount.cpp.orig Thu Nov 2 13:11:52 2006
+++ kopete/protocols/oscar/oscaraccount.cpp Thu Nov 2 13:12:39 2006
@@ -560,7 +560,7 @@ bool OscarAccount::createContact(const Q
/* We're not even online or connecting
* (when getting server contacts), so don't bother
*/
- if ( !myself()->isOnline() )
+ if ( !engine()->isActive() )
{
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Can't add contact, we are offline!" << endl;
return false;