← Back to branch summary

~ubuntu-branches/debian/sid/kde-baseapps/sid

« back to all changes in this revision

Viewing changes to nsplugins/viewer/nsplugin.cpp

  • Committer: Package Import Robot
  • Author(s): Modestas Vainius, Eshat Cakar, Pino Toscano
  • Date: 2012-06-09 22:18:08 UTC
  • mfrom: (4.2.1) (6.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20120609221808-h1l0ekd5qmb8nefr
Tags: 4:4.8.4-1
* New upstream release.

[ Eshat Cakar ]
* Add watch file.
* Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
* Update installed files.

[ Pino Toscano ]
* Move files of the konqueror documentation from kde-baseapps-data to
  konqueror itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nsplugins/viewer/nsplugin.cpp
1312
1312
   QDBusConnection::sessionBus().registerObject( "/Viewer", this );
1313
1313
 
1314
1314
    QObject::connect(QDBusConnection::sessionBus().interface(),
1315
 
                     SIGNAL(serviceOwnerChanged(const QString&, const QString&, const QString&)),
1316
 
                     this, SLOT(appChanged( const QString&, const QString&, const QString&)));
 
1315
                     SIGNAL(serviceOwnerChanged(QString,QString,QString)),
 
1316
                     this, SLOT(appChanged(QString,QString,QString)));
1317
1317
}
1318
1318
 
1319
1319
 
1915
1915
        if (reload) {
1916
1916
            _job->addMetaData("cache", "reload");
1917
1917
        }
1918
 
        connect(_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
1919
 
                SLOT(data(KIO::Job *, const QByteArray &)));
1920
 
        connect(_job, SIGNAL(result(KJob *)), SLOT(result(KJob *)));
1921
 
        connect(_job, SIGNAL(totalSize(KJob *, qulonglong )),
1922
 
                SLOT(totalSize(KJob *, qulonglong)));
1923
 
        connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
1924
 
                SLOT(mimetype(KIO::Job *, const QString &)));
1925
 
        connect(_job, SIGNAL(redirection(KIO::Job *, const KUrl&)),
1926
 
                SLOT(redirection(KIO::Job *, const KUrl&)));
 
1918
        connect(_job, SIGNAL(data(KIO::Job*,QByteArray)),
 
1919
                SLOT(data(KIO::Job*,QByteArray)));
 
1920
        connect(_job, SIGNAL(result(KJob*)), SLOT(result(KJob*)));
 
1921
        connect(_job, SIGNAL(totalSize(KJob*,qulonglong)),
 
1922
                SLOT(totalSize(KJob*,qulonglong)));
 
1923
        connect(_job, SIGNAL(mimetype(KIO::Job*,QString)),
 
1924
                SLOT(mimetype(KIO::Job*,QString)));
 
1925
        connect(_job, SIGNAL(redirection(KIO::Job*,KUrl)),
 
1926
                SLOT(redirection(KIO::Job*,KUrl)));
1927
1927
    }
1928
1928
 
1929
1929
    return false;
1943
1943
        _job->addMetaData("errorPage", "false");
1944
1944
        _job->addMetaData("PropagateHttpHeader", "true");
1945
1945
        _job->addMetaData("AllowCompressedPage", "false");
1946
 
        connect(_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
1947
 
                SLOT(data(KIO::Job *, const QByteArray &)));
1948
 
        connect(_job, SIGNAL(result(KJob *)), SLOT(result(KJob *)));
1949
 
        connect(_job, SIGNAL(totalSize(KJob *, qulonglong )),
1950
 
                SLOT(totalSize(KJob *, qulonglong)));
1951
 
        connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
1952
 
                SLOT(mimetype(KIO::Job *, const QString &)));
1953
 
        connect(_job, SIGNAL(redirection(KIO::Job *, const KUrl&)),
1954
 
                SLOT(redirection(KIO::Job *, const KUrl&)));
 
1946
        connect(_job, SIGNAL(data(KIO::Job*,QByteArray)),
 
1947
                SLOT(data(KIO::Job*,QByteArray)));
 
1948
        connect(_job, SIGNAL(result(KJob*)), SLOT(result(KJob*)));
 
1949
        connect(_job, SIGNAL(totalSize(KJob*,qulonglong)),
 
1950
                SLOT(totalSize(KJob*,qulonglong)));
 
1951
        connect(_job, SIGNAL(mimetype(KIO::Job*,QString)),
 
1952
                SLOT(mimetype(KIO::Job*,QString)));
 
1953
        connect(_job, SIGNAL(redirection(KIO::Job*,KUrl)),
 
1954
                SLOT(redirection(KIO::Job*,KUrl)));
1955
1955
    }
1956
1956
 
1957
1957
    return false;