diff -u kopete-3.5.5+kopete0.12.3/debian/changelog kopete-3.5.5+kopete0.12.3/debian/changelog --- kopete-3.5.5+kopete0.12.3/debian/changelog +++ kopete-3.5.5+kopete0.12.3/debian/changelog @@ -1,3 +1,22 @@ +kopete (4:3.5.5+kopete0.12.3-0ubuntu3) edgy-proposed; urgency=low + + * Edit kubuntu_04_icq_connect_fix.diff + Upstream changed the fix to not only allow connections with status set to + Online. Now one can connect with other statuses, for example Away. + + -- Frode M. Doeving Wed, 1 Nov 2006 21:51:21 +0100 + +kopete (4:3.5.5+kopete0.12.3-0ubuntu2) edgy; urgency=low + + [ Frode M. Doeving ] + * Add kubuntu_04_icq_connect_fix.diff + Changes in the OSCAR servers, they stopped sending own user information + at logon. Now we have to send a own user information request. + (Closes Malone: #69494, #69583) + + + -- Frode M. Doeving Wed, 1 Nov 2006 00:20:06 +0100 + kopete (4:3.5.5+kopete0.12.3-0ubuntu1) edgy; urgency=low * New upstream release only in patch2: unchanged: --- kopete-3.5.5+kopete0.12.3.orig/debian/patches/kubuntu_04_icq_connect_fix.diff +++ kopete-3.5.5+kopete0.12.3/debian/patches/kubuntu_04_icq_connect_fix.diff @@ -0,0 +1,28 @@ +diff -Nur kopete-3.5.5+kopete0.12.3/kopete/protocols/oscar/liboscar/client.cpp kopete-3.5.5+kopete0.12.3.new/kopete/protocols/oscar/liboscar/client.cpp +--- kopete-3.5.5+kopete0.12.3/kopete/protocols/oscar/liboscar/client.cpp 2006-10-01 19:26:52.000000000 +0200 ++++ kopete-3.5.5+kopete0.12.3.new/kopete/protocols/oscar/liboscar/client.cpp 2006-11-01 21:38:44.000000000 +0100 +@@ -397,9 +397,11 @@ + 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 ) +diff -Nur kopete-3.5.5+kopete0.12.3/kopete/protocols/oscar/oscaraccount.cpp kopete-3.5.5+kopete0.12.3.new/kopete/protocols/oscar/oscaraccount.cpp +--- kopete-3.5.5+kopete0.12.3/kopete/protocols/oscar/oscaraccount.cpp 2006-10-01 19:26:54.000000000 +0200 ++++ kopete-3.5.5+kopete0.12.3.new/kopete/protocols/oscar/oscaraccount.cpp 2006-11-01 21:41:23.000000000 +0100 +@@ -560,7 +560,7 @@ + /* 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;