← Back to branch summary

~ubuntu-branches/ubuntu/utopic/psi/utopic

« back to all changes in this revision

Viewing changes to src/eventdlg.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/eventdlg.cpp
1149
1149
                if(j.resource().isEmpty())
1150
1150
                        jid = u->jid().full();
1151
1151
                else
1152
 
                        jid = u->jid().userHost() + '/' + j.resource();
 
1152
                        jid = u->jid().withResource(j.resource());
1153
1153
 
1154
1154
                QString name;
1155
1155
                if(!u->name().isEmpty())
1264
1264
                if(r.isEmpty())
1265
1265
                        j = u->jid().full();
1266
1266
                else
1267
 
                        j = u->jid().userHost() + '/' + r;
 
1267
                        j = Jid(u->jid().bare()).withResource(r).full();
1268
1268
 
1269
1269
                if(!u->name().isEmpty())
1270
1270
                        name = u->name() + QString(" <%1>").arg(JIDUtil::encode822(j));
1507
1507
        if(list.isEmpty())
1508
1508
                return;
1509
1509
 
1510
 
        // FIXME: Maybe it's better without bare(), but then PsiAccount::actionChat
1511
 
        // doesn't find the UserListItem to chat with :-(
1512
 
        Jid jf(list[0]);
1513
 
        Jid j(jf.bare());
 
1510
        Jid j(list[0]);
1514
1511
        aChat(j);
1515
1512
}
1516
1513
 
1862
1859
                QString txt = xhtml ? m.html().toString("div") : TextUtil::plain2rich(m.body());
1863
1860
 
1864
1861
                // show subject line if the incoming message has one
1865
 
                if(m.subject() != "" && !PsiOptions::instance()->getOption("options.ui.message.show-subjects").toBool())
 
1862
                if(!m.subject().isEmpty() && !PsiOptions::instance()->getOption("options.ui.message.show-subjects").toBool())
1866
1863
                        txt = "<p><font color=\"red\"><b>" + tr("Subject:") + " " + TextUtil::plain2rich(m.subject()) + "</b></font></p>" + (xhtml? "" : "<br>") + txt;
1867
1864
 
1868
1865
                if (!xhtml) {