← Back to branch summary

~ubuntu-branches/ubuntu/feisty/psi/feisty

« back to all changes in this revision

Viewing changes to iris/xmpp-im/xmpp_tasks.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2005-09-14 16:33:49 UTC
  • mfrom: (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20050914163349-3zacov4afysz5cw5
Tags: 0.9.3-2ubuntu1
* Sync with debian
* Applied patch to psi.desktop to start psi without gpg-agent use (known
  issue)
* Updated README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
iris/xmpp-im/xmpp_tasks.cpp
677
677
:Task(parent)
678
678
{
679
679
        m = msg;
 
680
        m.setId(id());
680
681
}
681
682
 
682
683
JT_Message::~JT_Message()
1575
1576
                                item.setNode( e.attribute("node") );
1576
1577
                                item.setAction( DiscoItem::string2action(e.attribute("action")) );
1577
1578
 
1578
 
                                d->items.push_back( item );
 
1579
                                d->items.append( item );
1579
1580
                        }
1580
1581
                }
1581
1582
 
1688
1689
                                id.name     = e.attribute("name");
1689
1690
                                id.type     = e.attribute("type");
1690
1691
 
1691
 
                                identities.push_back( id );
 
1692
                                identities.append( id );
1692
1693
                        }
1693
1694
                }
1694
1695