--Boundary-00=_MQ5oKAIffTXK6k2 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Dnia niedziela 06 wrzesie=C5=84 2009 o 03:52:18 Matt Rogers napisa=C5=82(a): > Reply at the bottom >=20 > On Fri, 2009-09-04 at 12:16 +0200, pennguin wrote: > > Hello, > > > > I have had free time and created two patches for kopete's gadugadu > > plugin. For bugs: > > 163541: Setting description in Gadu plugin makes it go offline > > 184696: Gadu-gadu has problems with contact list > > > > The first one fixes setting of description (currently it goes offline f= or > > every status but for offline status it goes... online!) It's my old pat= ch > > but hasn't been committed... > > The second one is more important is at fixes bad handling of gadugadu > > import contact list, which after couple of reconnects make a lot of dead > > and empty contacts in kopete contact list. Whole trouble is because the > > of the one line in imported gadu contact list (it always starts with > > GG70ExportString; and is just a list of groups) so I wrote a patch to > > ignore it. > > > > I'm using both patches and haven't notice any troubles. > > > > BTW Does gadugadu plugin have any active development? I'm asking because > > new libgadu-1.9.0-rc1 was released today, which brings support for new > > protocol in gadugadu (UTF8 support, new statuses). Are there any plans = to > > introduce it in kopete? If not I would like to do it and also deal with > > couple of most irritating bugs in gadugadu protocol (ex. not working > > public directory search since kopete3! - honestly I'm working on it rig= ht > > know). > > > > Jakub Grandys - Pennguin >=20 > I tried to apply the patch for bug 163541 and it wouldn't apply. Could > you regenerate and resend the patch? Sory, I've must messed something, attached are working patches. I've tested= =20 them and are working for me ;) should apply now clean and easy against trun= k=20 and also stable branch. > Nobody actively works on Gadu Gadu support at the moment, and it would be= =20 > great to have some additional help in that area of Kopete. So as long as I will have time I will try to at least bug-hunt gadu plugin.= =20 > We use an external libgadu now, so provided that Kopete still compiles wh= en=20 > using it (and it may not), then hopefully we'll have an easier time takin= g=20 > advantage of that new functionality.=20 AFAIK kopete should compile and work with new version, simply using old=20 protocol version. Will try it in couple of days. > Please feel free to continue to submit patches for review (either on the= =20 > mailing list or via reviewboard) and I'll get them committed for you. Aft= er=20 > you've got a few more patches under your belt, then I'll support your > request for an SVN account.=20 Thanks, as soon as I finish some patches will send it here or on reviewboar= d. Jakub Grandys Pennguin --Boundary-00=_MQ5oKAIffTXK6k2 Content-Type: text/x-patch; charset="iso-8859-15"; name="gadu.163541.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gadu.163541.diff" Index: kopete/protocols/gadu/gaduaway.cpp =================================================================== --- kopete/protocols/gadu/gaduaway.cpp (revision 1020430) +++ kopete/protocols/gadu/gaduaway.cpp (working copy) @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -49,18 +48,25 @@ GaduAway::GaduAway( GaduAccount* account ui_->setupUi( w ); setMainWidget( w ); + ui_->buttonGroup_->setId(ui_->onlineButton_, GG_STATUS_AVAIL_DESCR); + ui_->buttonGroup_->setId(ui_->awayButton_, GG_STATUS_BUSY_DESCR); + ui_->buttonGroup_->setId(ui_->invisibleButton_, GG_STATUS_INVISIBLE_DESCR); + ui_->buttonGroup_->setId(ui_->offlineButton_, GG_STATUS_NOT_AVAIL_DESCR); + + ks = account->myself()->onlineStatus(); s = GaduProtocol::protocol()->statusToWithDescription( ks ); + if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { - ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( true ); - ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR ); + ui_->buttonGroup_->button( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( true ); + ui_->buttonGroup_->button( GG_STATUS_AVAIL_DESCR)->setChecked(true); } else { - ui_->statusGroup_->setButton( s ); + ui_->buttonGroup_->button( s )->setChecked(true); } - ui_->textEdit_->setText( account->myself()->property( "awayMessage" ).value().toString() ); + ui_->textEdit_->setText( account->myself()->property( "statusMessage" ).value().toString() ); connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) ); } @@ -72,7 +78,7 @@ GaduAway::~GaduAway() int GaduAway::status() const { - return ui_->statusGroup_->id( ui_->statusGroup_->selected() ); + return ui_->buttonGroup_->checkedId(); } QString Index: kopete/protocols/gadu/ui/gaduawayui.ui =================================================================== --- kopete/protocols/gadu/ui/gaduawayui.ui (revision 1020430) +++ kopete/protocols/gadu/ui/gaduawayui.ui (working copy) @@ -1,155 +1,123 @@ - + + GaduAwayUI - - + + 0 0 332 - 188 + 200 - + Qt::TabFocus - + Away Dialog - - + + 0 - - 0 - - - 0 - - - 0 - - - 6 - - + 6 - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Choose a status; by default Online status is selected. So all you need to do is just to type in your description. Choosing Offline status will disconnect you, with given description. - + Status - - Qt::Vertical - - - - 11 - - + + 11 - - 11 - - - 11 - - - 6 - - + 6 - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Set your status to Online. - + Set your status to Online, indicating that you are available to chat with anyone who wishes. - + O&nline + + buttonGroup_ + - - + + Set your status to busy. - + Set your status to busy, indicating that you should not be bothered with trivial chat, and may not be able to reply immediately. - + &Busy + + buttonGroup_ + - - + + Set status to invisible, which will hide your presence from other users. - + Set status to invisible, which will hide your presence from other users (who will see you as offline). However you may still chat, and see the online presence of others. - + &Invisible + + buttonGroup_ + - - + + Choose this status to disconnect with the description entered below. - + Choose this status to disconnect with the description entered below. - + O&ffline + + buttonGroup_ + @@ -158,50 +126,41 @@ Choosing Offline status will disconnect - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Description of your status. - + Description of your status (up to 70 characters). - + &Message: - + textEdit_ - - + + false - + Description of your status. - + Description of your status (up to 70 characters). - + 70 @@ -212,14 +171,6 @@ Choosing Offline status will disconnect - - - Q3ButtonGroup - Q3GroupBox -
Qt3Support/Q3ButtonGroup
- 1 - - onlineButton_ awayButton_ @@ -229,4 +180,7 @@ Choosing Offline status will disconnect + + + --Boundary-00=_MQ5oKAIffTXK6k2 Content-Type: text/x-patch; charset="iso-8859-15"; name="gadu.184696.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gadu.184696.diff" Index: kopete/protocols/gadu/gaducontactlist.cpp =================================================================== --- kopete/protocols/gadu/gaducontactlist.cpp (revision 1020430) +++ kopete/protocols/gadu/gaducontactlist.cpp (working copy) @@ -61,12 +61,18 @@ GaduContactsList::GaduContactsList( QStr strList = cline.split( QChar( ';' ), QString::KeepEmptyParts ); - if ( strList.size() < 7 ) { + stringIterator = strList.begin(); + + if ((*stringIterator) == "GG70ExportString,") { + // since it doesn't matter for neither kopete nor ggserver + // its just list of current groups but may spoil contact list + kDebug( 14100 ) << "Ignoring GG70ExportSting contact list member"; + break; + } else if ( strList.size() < 7 ) { kDebug( 14100 ) << "Malformed entry, too short! Ignoring entry: " << strList; break; } - stringIterator = strList.begin(); if ( strList.count() >= 12 ) { email = true; --Boundary-00=_MQ5oKAIffTXK6k2 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel --Boundary-00=_MQ5oKAIffTXK6k2--