← Back to branch summary

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

« back to all changes in this revision

Viewing changes to apps/konqueror/client/kfmclient.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-12-02 13:28:20 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20091202132820-yaqzqr7livmarip5
Tags: 4:4.3.80-0ubuntu1
* New upstream release:
  - Drop kubuntu_05_konsole_colour_scheme.diff, applied upstream
  - Drop kubuntu_15-17.diff, applied upstream
  - Bump build-depend versions
  - Add build-depend on shared-desktop-ontologies for nepomuk support
  - Update various .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/konqueror/client/kfmclient.cpp
120
120
        version = atoi( getenv( "KDE_SESSION_VERSION" ));
121
121
    if( version != 0 && version != KDE_VERSION_MAJOR )
122
122
    {
123
 
        kDebug( 1202 ) << "Forwarding to kfmclient from KDE version " << version;
 
123
        kDebug() << "Forwarding to kfmclient from KDE version " << version;
124
124
        char wrapper[ 10 ];
125
125
        sprintf( wrapper, "kde%d", version );
126
126
        char** newargv = new char*[ argc + 2 ];
321
321
 
322
322
bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, const QString & mimetype)
323
323
{
324
 
    kDebug( 1202 ) << url << "mimetype=" << mimetype;
 
324
    kDebug() << url << "mimetype=" << mimetype;
325
325
    needInstance();
326
326
 
327
327
    if (url.protocol().startsWith(QLatin1String("http")))
328
328
    {
329
329
        KConfig config(QLatin1String("kfmclientrc"));
330
330
        KConfigGroup generalGroup(&config, "General");
331
 
        if (!generalGroup.readEntry("BrowserApplication").isEmpty())
 
331
        const QString browserApp = generalGroup.readEntry("BrowserApplication");
 
332
        if (!browserApp.isEmpty() && !browserApp.startsWith("!kfmclient"))
332
333
        {
333
 
            kDebug() << "Using external browser" << generalGroup.readEntry( "BrowserApplication" );
 
334
            kDebug() << "Using external browser" << browserApp;
334
335
            Q_ASSERT( qApp );
335
336
            //ClientApp app;
336
337
#ifdef Q_WS_X11
389
390
    QString appId = konqyToReuse( url.url(), mimetype, QString() );
390
391
    if( !appId.isEmpty())
391
392
    {
392
 
        kDebug( 1202 ) << "ClientApp::createNewWindow using existing konqueror";
 
393
        kDebug() << "ClientApp::createNewWindow using existing konqueror";
393
394
        org::kde::Konqueror::Main konq( appId, "/KonqMain", dbus );
394
395
        konq.createNewWindow( url.url(), mimetype, startup_id_str, tempFile );
395
396
        sendASNChange();
420
421
#ifdef Q_WS_X11
421
422
            KStartupInfo::resetStartupEnv();
422
423
#endif
423
 
            kDebug( 1202 ) << "ClientApp::createNewWindow KProcess started";
 
424
            kDebug() << "ClientApp::createNewWindow KProcess started";
424
425
        //}
425
426
    }
426
427
    return true;