← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/eventdb.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/eventdb.cpp
311
311
        QString findStr;
312
312
        PsiEvent *event;
313
313
 
314
 
        typedef enum Type {
 
314
        enum Type {
315
315
                Type_getLatest = 0,
316
316
                Type_getOldest,
317
317
                Type_get,
447
447
{
448
448
        File *i = findFile(j);
449
449
        if(!i) {
450
 
                i = new File(Jid(j.userHost()));
 
450
                i = new File(Jid(j.bare()));
451
451
                connect(i, SIGNAL(timeout()), SLOT(file_timeout()));
452
452
                d->flist.append(i);
453
453
        }
635
635
 
636
636
QString EDBFlatFile::File::jidToFileName(const XMPP::Jid &j)
637
637
{
638
 
        return ApplicationInfo::historyDir() + "/" + JIDUtil::encode(j.userHost()).toLower() + ".history";
 
638
        return ApplicationInfo::historyDir() + "/" + JIDUtil::encode(j.bare()).toLower() + ".history";
639
639
}
640
640
 
641
641
void EDBFlatFile::File::ensureIndex()