← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to src/irc/nicksonline.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-15 11:24:24 UTC
  • mfrom: (1.15.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090515112424-b74i26lciabf4qnk
Tags: 1.1.75+svn968012-1
* New upstream development snapshot:
  - Last Changed Author: hein
  - Last Changed Rev: 968012
  - Last Changed Date: 2009-05-14 21:03:55 +0300
* Update README.source.
* Use dh --quilt instead of custom patch handling, build depend on
  quilt 0.46-7~.
* Update patches to upstream changes.
* Update konversation.install: remove docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/irc/nicksonline.cpp
311
311
    // watch list.
312
312
    networkRoot->setText(nlvcServerName, serverName);
313
313
    // Update list of servers in the network that are connected.
314
 
    QStringList serverList = networkRoot->text(nlvcAdditionalInfo).split(",", QString::SkipEmptyParts);
 
314
    QStringList serverList = networkRoot->text(nlvcAdditionalInfo).split(',', QString::SkipEmptyParts);
315
315
    if (!serverList.contains(serverName)) serverList.append(serverName);
316
316
    networkRoot->setText(nlvcAdditionalInfo, serverList.join(","));
317
317
    // Get item in nicklistview for the Offline branch.
548
548
    {
549
549
        Q3ListViewItem* nextChild = child->nextSibling();
550
550
        QString networkName = child->text(nlvcNetwork);
551
 
        QStringList serverNameList = child->text(nlvcAdditionalInfo).split(",", QString::SkipEmptyParts);
 
551
        QStringList serverNameList = child->text(nlvcAdditionalInfo).split(',', QString::SkipEmptyParts);
552
552
        QStringList::Iterator itEnd = serverNameList.end();
553
553
        QStringList::Iterator it = serverNameList.begin();
554
554
        while (it != itEnd)