← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily-proposed

« back to all changes in this revision

Viewing changes to src/discodlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2009-09-25 17:49:51 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090925174951-lvm7kdap82o8xhn3
Tags: 0.13-1
* Updated to upstream version 0.13
* Set Standards-Version to 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/discodlg.cpp
283
283
        if ( !(!di.identities().isEmpty() && it.identities().isEmpty()) )
284
284
                di.setIdentities ( it.identities() );
285
285
 
286
 
        if ( di.jid().userHost().left(4) == "jud." || di.jid().userHost().left(6) == "users." ) {
 
286
        if ( di.jid().bare().left(4) == "jud." || di.jid().bare().left(6) == "users." ) {
287
287
                // nasty hack for the nasty (and outdated) JUD service :-/
288
288
                if ( !di.features().canSearch() ) {
289
289
                        QStringList features = di.features().list();
399
399
                        if ( id.category == "service" && id.type == "jud" )
400
400
                                return;
401
401
                }
402
 
                QString j = item().jid().host(); // just another method to discover if we're gonna to browse JUD
403
 
                if ( item().jid().user().isEmpty() && (j.left(4) == "jud." || j.left(6) == "users.") )
 
402
                QString j = item().jid().domain(); // just another method to discover if we're gonna to browse JUD
 
403
                if ( item().jid().node().isEmpty() && (j.left(4) == "jud." || j.left(6) == "users.") )
404
404
                        return;
405
405
        }
406
406
 
1029
1029
        toolBar->addAction(actRegister);
1030
1030
        toolBar->addAction(actSearch);
1031
1031
        toolBar->addAction(actJoin);
1032
 
        toolBar->addAction(actAHCommand);
1033
1032
 
1034
1033
        toolBar->addSeparator();
1035
1034
        toolBar->addAction(actAdd);