← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/dolphin/src/dolphinpart.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Alessandro Ghersi, Harald Sitter, Jonathan Thomas
  • Date: 2009-10-03 03:45:08 UTC
  • mfrom: (1.1.33 upstream)
  • Revision ID: james.westby@ubuntu.com-20091003034508-ywdmnfa7ollb3ptk
Tags: 4:4.3.2-0ubuntu1
https://launchpad.net/bugs/278722
https://launchpad.net/bugs/421742
[ Alessandro Ghersi ]
* New upstream release
  - Bump build-deps

[ Harald Sitter ]
* Make Lintian happy about the konqueror maintainer scripts
* Add konsole maintainer scripts to register it as x-terminal-emulator
  alternative (LP: #278722)
* Add kubuntu_19_install_flash.diff using update-notifier-kde to recommend
  installation of flash plugin

[ Jonathan Thomas ]
* Bump replaces for konqueror on dolphin to (<< 4:4.2.85) (LP: #421742)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/dolphin/src/dolphinpart.cpp
31
31
#include <kaboutdata.h>
32
32
#include <kactioncollection.h>
33
33
#include <kconfiggroup.h>
 
34
#include <kdebug.h>
34
35
#include <kdirlister.h>
35
36
#include <kglobalsettings.h>
36
37
#include <kiconloader.h>
436
437
void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
437
438
{
438
439
    //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
439
 
    if (oldUrl == url()) {
 
440
    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {
440
441
        KParts::ReadOnlyPart::setUrl(newUrl);
441
442
        const QString prettyUrl = newUrl.pathOrUrl();
442
443
        emit m_extension->setLocationBarUrl(prettyUrl);