← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to kio/bookmarks/kbookmarkmanager.cc

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-11-06 22:32:05 UTC
  • mfrom: (1.14.23)
  • Revision ID: package-import@ubuntu.com-20121106223205-gagst9s46g041mmo
Tags: 4:4.9.3-0ubuntu1
https://launchpad.net/bugs/1074747
* New upstream release (LP: #1074747)
  - drop fix_samba.diff, applied upstream
  - add new symbols to libkjsapi4.symbols and libkio5.symbols
  - refresh python3-support-bytecode.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/bookmarks/kbookmarkmanager.cc
502
502
    // is already loaded
503
503
    QDomElement elem = root().findToolbar();
504
504
    if (elem.isNull())
505
 
        return root(); // Root is the bookmark toolbar if none has been set.
 
505
    {
 
506
        // Root is the bookmark toolbar if none has been set.
 
507
        // Make it explicit to speed up invocations of findToolbar()
 
508
        root().internalElement().setAttribute("toolbar", "yes");
 
509
        return root();
 
510
    }
506
511
    else
507
 
        return KBookmarkGroup(root().findToolbar());
 
512
        return KBookmarkGroup(elem);
508
513
}
509
514
 
510
515
KBookmark KBookmarkManager::findByAddress( const QString & address )