Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 756 insertions, 0 deletions

diff --git a/konqueror/client/ChangeLog b/konqueror/client/ChangeLog
new file mode 100644
index 000000000..a32836ebf
--- /dev/null
+++ b/konqueror/client/ChangeLog
@@ -0,0 +1,14 @@
+1999-11-08  Kurt Granroth <granroth@kde.org>
+	* if 'exec' has no parameters, popup the Execute Command
+	  dialog from kdesktop
+
+1999-05-28  Simon Hausmann <hausmann@kde.org>
+
+        * use kded instead of the ior file
+	* use KOMApplication instead of OPApplication (no need for
+	  OpenParts at all)
+
+1999-04-28  Christophe Prud'homme  <Christophe.Prudhomme@ann.jussieu.fr>
+
+	* Makefile.am: $(top_srcdir) to $(top_builddir)
+
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
new file mode 100644
index 000000000..97a5b66e4
--- /dev/null
+++ b/konqueror/client/Makefile.am
@@ -0,0 +1,23 @@
+AM_CPPFLAGS = -DQT_NO_CAST_ASCII
+
+bin_PROGRAMS= 
+lib_LTLIBRARIES = 
+kdeinit_LTLIBRARIES = kfmclient.la
+
+INCLUDES= -I.. $(all_includes)
+kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kfmclient_la_LIBADD =  $(LIB_KIO)
+kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+
+noinst_HEADERS = kfmclient.h
+METASOURCES = AUTO
+
+KonquerorIface_DIR =  $(srcdir)/..
+KDesktopIface_DIR = $(top_srcdir)/kdesktop
+
+messages:
+	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
+
+updatedir = $(kde_datadir)/kconf_update
+update_DATA = kfmclient_3_2.upd
+update_SCRIPTS = kfmclient_3_2_update.sh
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
new file mode 100644
index 000000000..f60c48dbe
--- /dev/null
+++ b/konqueror/client/kfmclient.cc
@@ -0,0 +1,643 @@
+/* This file is part of the KDE project
+   Copyright (C) 1999 David Faure <faure@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <qdir.h>
+
+#include <kio/job.h>
+#include <kcmdlineargs.h>
+#include <kpropertiesdialog.h>
+#include <klocale.h>
+#include <ktrader.h>
+#include <kprocess.h>
+#include <kstandarddirs.h>
+#include <kopenwith.h>
+#include <kurlrequesterdlg.h>
+#include <kmessagebox.h>
+#include <kfiledialog.h>
+#include <kdebug.h>
+#include <dcopclient.h>
+#include <kservice.h>
+#include <qregexp.h>
+
+#include "kfmclient.h"
+#include "KonquerorIface_stub.h"
+#include "KDesktopIface_stub.h"
+#include "kwin.h"
+
+#include <X11/Xlib.h>
+
+static const char appName[] = "kfmclient";
+static const char programName[] = I18N_NOOP("kfmclient");
+
+static const char description[] = I18N_NOOP("KDE tool for opening URLs from the command line");
+
+static const char version[] = "2.0";
+
+QCString clientApp::startup_id_str;
+bool clientApp::m_ok = true;
+bool s_interactive = true;
+
+static const KCmdLineOptions options[] =
+{
+   { "noninteractive", I18N_NOOP("Non interactive use: no message boxes"), 0},
+   { "commands", I18N_NOOP("Show available commands"), 0},
+   { "+command", I18N_NOOP("Command (see --commands)"), 0},
+   { "+[URL(s)]", I18N_NOOP("Arguments for command"), 0},
+   KCmdLineLastOption
+};
+
+extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+{
+  KCmdLineArgs::init(argc, argv, appName, programName, description, version, false);
+
+  KCmdLineArgs::addCmdLineOptions( options );
+  KCmdLineArgs::addTempFileOption();
+
+  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+  if ( args->isSet("commands") )
+  {
+    KCmdLineArgs::enable_i18n();
+    puts(i18n("\nSyntax:\n").local8Bit());
+    puts(i18n("  kfmclient openURL 'url' ['mimetype']\n"
+                "            # Opens a window showing 'url'.\n"
+                "            #  'url' may be a relative path\n"
+                "            #   or file name, such as . or subdir/\n"
+                "            #   If 'url' is omitted, $HOME is used instead.\n\n").local8Bit());
+    puts(i18n("            # If 'mimetype' is specified, it will be used to determine the\n"
+                "            #   component that Konqueror should use. For instance, set it to\n"
+                "            #   text/html for a web page, to make it appear faster\n\n").local8Bit());
+
+    puts(i18n("  kfmclient newTab 'url' ['mimetype']\n"
+                "            # Same as above but opens a new tab with 'url' in an existing Konqueror\n"
+                "            #   window on the current active desktop if possible.\n\n").local8Bit());
+
+    puts(i18n("  kfmclient openProfile 'profile' ['url']\n"
+                "            # Opens a window using the given profile.\n"
+                "            #   'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n"
+                "            #   'url' is an optional URL to open.\n\n").local8Bit());
+
+    puts(i18n("  kfmclient openProperties 'url'\n"
+                "            # Opens a properties menu\n\n").local8Bit());
+    puts(i18n("  kfmclient exec ['url' ['binding']]\n"
+                "            # Tries to execute 'url'. 'url' may be a usual\n"
+                "            #   URL, this URL will be opened. You may omit\n"
+                "            #   'binding'. In this case the default binding\n").local8Bit());
+    puts(i18n("            #   is tried. Of course URL may be the URL of a\n"
+                "            #   document, or it may be a *.desktop file.\n").local8Bit());
+    puts(i18n("            #   This way you could for example mount a device\n"
+                "            #   by passing 'Mount default' as binding to \n"
+                "            #   'cdrom.desktop'\n\n").local8Bit());
+    puts(i18n("  kfmclient move 'src' 'dest'\n"
+                "            # Moves the URL 'src' to 'dest'.\n"
+                "            #   'src' may be a list of URLs.\n").local8Bit());
+    //puts(i18n("            #   'dest' may be \"trash:/\" to move the files\n"
+    //            "            #   in the trash bin.\n\n").local8Bit());
+    puts(i18n("  kfmclient download ['src']\n"
+                "            # Copies the URL 'src' to a user specified location'.\n"
+                "            #   'src' may be a list of URLs, if not present then\n"
+                "            #   a URL will be requested.\n\n").local8Bit());
+    puts(i18n("  kfmclient copy 'src' 'dest'\n"
+                "            # Copies the URL 'src' to 'dest'.\n"
+                "            #   'src' may be a list of URLs.\n\n").local8Bit());
+    puts(i18n("  kfmclient sortDesktop\n"
+                "            # Rearranges all icons on the desktop.\n\n").local8Bit());
+    puts(i18n("  kfmclient configure\n"
+                "            # Re-read Konqueror's configuration.\n\n").local8Bit());
+    puts(i18n("  kfmclient configureDesktop\n"
+                "            # Re-read kdesktop's configuration.\n\n").local8Bit());
+
+    puts(i18n("*** Examples:\n"
+                "  kfmclient exec file:/root/Desktop/cdrom.desktop \"Mount default\"\n"
+                "             // Mounts the CD-ROM\n\n").local8Bit());
+    puts(i18n("  kfmclient exec file:/home/weis/data/test.html\n"
+                "             // Opens the file with default binding\n\n").local8Bit());
+    puts(i18n("  kfmclient exec file:/home/weis/data/test.html Netscape\n"
+                "             // Opens the file with netscape\n\n").local8Bit());
+    puts(i18n("  kfmclient exec ftp://localhost/\n"
+                "             // Opens new window with URL\n\n").local8Bit());
+    puts(i18n("  kfmclient exec file:/root/Desktop/emacs.desktop\n"
+                "             // Starts emacs\n\n").local8Bit());
+    puts(i18n("  kfmclient exec file:/root/Desktop/cdrom.desktop\n"
+                "             // Opens the CD-ROM's mount directory\n\n").local8Bit());
+    puts(i18n("  kfmclient exec .\n"
+                "             // Opens the current directory. Very convenient.\n\n").local8Bit());
+    return 0;
+  }
+
+  return clientApp::doIt() ? 0 /*no error*/ : 1 /*error*/;
+}
+
+/*
+ Whether to start a new konqueror or reuse an existing process.
+
+ First of all, this concept is actually broken, as the view used to show
+ the data may change at any time, and therefore Konqy reused to browse
+ "safe" data may eventually browse something completely different.
+ Moreover, it's quite difficult to find out when to reuse, and thus this
+ function is an ugly hack. You've been warned.
+
+ Kfmclient will attempt to find an instance for reusing if either reusing
+ is configured to reuse always,
+ or it's not configured to never reuse, and the URL to-be-opened is "safe".
+ The URL is safe, if the view used to view it is listed in the allowed KPart's.
+ In order to find out the part, mimetype is needed, and KTrader is needed.
+ If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
+ URLs, but oh well). Since this function may be running without a KApplication
+ instance, I'm actually quite surprised it works, and it may sooner or later break.
+ Nice, isn't it?
+
+ If a profile is being used, and no url has been explicitly given, it needs to be
+ read from the profile. If there's more than one URL listed in the profile, no reusing
+ will be done (oh well), if there's no URL, no reusing will be done either (also
+ because the webbrowsing profile doesn't have any URL listed).
+*/
+static bool startNewKonqueror( QString url, QString mimetype, const QString& profile )
+{
+    KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+    cfg.setGroup( "Reusing" );
+    QStringList allowed_parts;
+    // is duplicated in ../KonquerorIface.cc
+    allowed_parts << QString::fromLatin1( "konq_iconview.desktop" )
+                  << QString::fromLatin1( "konq_multicolumnview.desktop" )
+                  << QString::fromLatin1( "konq_sidebartng.desktop" )
+                  << QString::fromLatin1( "konq_infolistview.desktop" )
+                  << QString::fromLatin1( "konq_treeview.desktop" )
+                  << QString::fromLatin1( "konq_detailedlistview.desktop" );
+    if( cfg.hasKey( "SafeParts" )
+        && cfg.readEntry( "SafeParts" ) != QString::fromLatin1( "SAFE" ))
+        allowed_parts = cfg.readListEntry( "SafeParts" );
+    if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" ))
+	return false; // all parts allowed
+    if( url.isEmpty())
+    {
+        if( profile.isEmpty())
+            return true;
+	QString profilepath = locate( "data", QString::fromLatin1("konqueror/profiles/") + profile );
+	if( profilepath.isEmpty())
+	    return true;
+	KConfig cfg( profilepath, true );
+	cfg.setDollarExpansion( true );
+        cfg.setGroup( "Profile" );
+	QMap< QString, QString > entries = cfg.entryMap( QString::fromLatin1( "Profile" ));
+	QRegExp urlregexp( QString::fromLatin1( "^View[0-9]*_URL$" ));
+	QStringList urls;
+	for( QMap< QString, QString >::ConstIterator it = entries.begin();
+	     it != entries.end();
+	     ++it )
+	{
+            // don't read value from map, dollar expansion is needed
+            QString value = cfg.readEntry( it.key());
+	    if( urlregexp.search( it.key()) >= 0 && !value.isEmpty())
+		urls << value;
+	}
+	if( urls.count() != 1 )
+	    return true;
+	url = urls.first();
+	mimetype = QString::fromLatin1( "" );
+    }
+    if( mimetype.isEmpty())
+	mimetype = KMimeType::findByURL( KURL( url ) )->name();
+    KTrader::OfferList offers = KTrader::self()->query( mimetype, QString::fromLatin1( "KParts/ReadOnlyPart" ),
+	QString::null, QString::null );
+    KService::Ptr serv;
+    if( offers.count() > 0 )
+        serv = offers.first();
+    return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + QString::fromLatin1(".desktop") );
+}
+
+static int currentScreen()
+{
+    if( qt_xdisplay() != NULL )
+        return qt_xscreen();
+    // case when there's no KApplication instance
+    const char* env = getenv( "DISPLAY" );
+    if( env == NULL )
+        return 0;
+    const char* dotpos = strrchr( env, '.' );
+    const char* colonpos = strrchr( env, ':' );
+    if( dotpos != NULL && colonpos != NULL && dotpos > colonpos )
+        return atoi( dotpos + 1 );
+    return 0;
+}
+
+// when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
+static QCString getPreloadedKonqy()
+{
+    KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+    cfg.setGroup( "Reusing" );
+    if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
+        return "";
+    DCOPRef ref( "kded", "konqy_preloader" );
+    QCString ret;
+    if( ref.callExt( "getPreloadedKonqy", DCOPRef::NoEventLoop, 3000, currentScreen()).get( ret ))
+	return ret;
+    return QCString();
+}
+
+
+static QCString konqyToReuse( const QString& url, const QString& mimetype, const QString& profile )
+{ // prefer(?) preloaded ones
+    QCString ret = getPreloadedKonqy();
+    if( !ret.isEmpty())
+        return ret;
+    if( startNewKonqueror( url, mimetype, profile ))
+        return "";
+    QCString appObj;
+    QByteArray data;
+    QDataStream str( data, IO_WriteOnly );
+    str << currentScreen();
+    if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
+             "processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
+        return "";
+    return ret;
+}
+
+static bool krun_has_error = false;
+
+void clientApp::sendASNChange()
+{
+    KStartupInfoId id;
+    id.initId( startup_id_str );
+    KStartupInfoData data;
+    data.addPid( 0 );   // say there's another process for this ASN with unknown PID
+    data.setHostname(); // ( no need to bother to get this konqy's PID )
+    Display* dpy = qt_xdisplay();
+    if( dpy == NULL ) // we may be running without QApplication here
+        dpy = XOpenDisplay( NULL );
+    if( dpy != NULL )
+        KStartupInfo::sendChangeX( dpy, id, data );
+    if( dpy != NULL && dpy != qt_xdisplay())
+        XCloseDisplay( dpy );
+}
+
+bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype)
+{
+    kdDebug( 1202 ) << "clientApp::createNewWindow " << url.url() << " mimetype=" << mimetype << endl;
+    // check if user wants to use external browser
+    // ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
+    // ###### KDE4: remove
+    KConfig config( QString::fromLatin1("kfmclientrc"));
+    config.setGroup( QString::fromLatin1("Settings"));
+    QString strBrowser = config.readPathEntry("ExternalBrowser");
+    if (!strBrowser.isEmpty())
+    {
+        if ( tempFile )
+            kdWarning() << "kfmclient used with --tempfile but is passing to an external browser! Tempfile will never be deleted" << endl;
+        KProcess proc;
+        proc << strBrowser << url.url();
+        proc.start( KProcess::DontCare );
+        return true;
+    }
+
+    if (url.protocol().startsWith(QString::fromLatin1("http")))
+    {
+        config.setGroup("General");
+        if (!config.readEntry("BrowserApplication").isEmpty())
+        {
+            clientApp app;
+            KStartupInfo::appStarted();
+
+            KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor]
+            QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() ));
+            QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() ));
+            app.exec();
+            return !krun_has_error;
+        }
+    }
+
+    KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+    cfg.setGroup( "FMSettings" );
+    if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
+    {
+        QCString foundApp, foundObj;
+        QByteArray data;
+        QDataStream str( data, IO_WriteOnly );
+        if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
+            "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
+        {
+            DCOPRef ref( foundApp, foundObj );
+            DCOPReply reply = ref.call( "newTabASN", url.url(), startup_id_str, tempFile );
+            if ( reply.isValid() ) {
+                sendASNChange();
+                return true;
+            }
+      }
+    }
+
+    QCString appId = konqyToReuse( url.url(), mimetype, QString::null );
+    if( !appId.isEmpty())
+    {
+        kdDebug( 1202 ) << "clientApp::createNewWindow using existing konqueror" << endl;
+        KonquerorIface_stub konqy( appId, "KonquerorIface" );
+        konqy.createNewWindowASN( url.url(), mimetype, startup_id_str, tempFile );
+        sendASNChange();
+    }
+    else
+    {
+        QString error;
+        /* Well, we can't pass a mimetype through startServiceByDesktopPath !
+        if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"),
+                                                      url.url(), &error ) > 0 )
+        {
+            kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
+            */
+            // pass kfmclient's startup id to konqueror using kshell
+            KStartupInfoId id;
+            id.initId( startup_id_str );
+            id.setupStartupEnv();
+            KProcess proc;
+            proc << "kshell" << "konqueror";
+            if ( !mimetype.isEmpty() )
+                proc << "-mimetype" << mimetype;
+            if ( tempFile )
+                proc << "-tempfile";
+            proc << url.url();
+            proc.start( KProcess::DontCare );
+            KStartupInfo::resetStartupEnv();
+            kdDebug( 1202 ) << "clientApp::createNewWindow KProcess started" << endl;
+        //}
+    }
+    return true;
+}
+
+bool clientApp::openProfile( const QString & profileName, const QString & url, const QString & mimetype )
+{
+  QCString appId = konqyToReuse( url, mimetype, profileName );
+  if( appId.isEmpty())
+  {
+    QString error;
+    if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"),
+        QString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
+    {
+      kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
+      return false;
+    }
+      // startServiceByDesktopPath waits for the app to register with DCOP
+      // so when we arrive here, konq is up and running already, and appId contains the identification
+  }
+
+  QString profile = locate( "data", QString::fromLatin1("konqueror/profiles/") + profileName );
+  if ( profile.isEmpty() )
+  {
+      fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() );
+      ::exit( 0 );
+  }
+  KonquerorIface_stub konqy( appId, "KonquerorIface" );
+  if ( url.isEmpty() )
+      konqy.createBrowserWindowFromProfileASN( profile, profileName, startup_id_str );
+  else if ( mimetype.isEmpty() )
+      konqy.createBrowserWindowFromProfileAndURLASN( profile, profileName, url, startup_id_str );
+  else
+      konqy.createBrowserWindowFromProfileAndURLASN( profile, profileName, url, mimetype, startup_id_str );
+  sleep(2); // Martin Schenk <martin@schenk.com> says this is necessary to let the server read from the socket
+  sendASNChange();
+  return true;
+}
+
+void clientApp::delayedQuit()
+{
+    // Quit in 2 seconds. This leaves time for KRun to pop up
+    // "app not found" in KProcessRunner, if that was the case.
+    QTimer::singleShot( 2000, this, SLOT(deref()) );
+    // don't access the KRun instance later, it will be deleted after calling slots
+    if( static_cast< const KRun* >( sender())->hasError())
+        krun_has_error = true;
+}
+
+static void checkArgumentCount(int count, int min, int max)
+{
+   if (count < min)
+   {
+      fputs( i18n("Syntax Error: Not enough arguments\n").local8Bit(), stderr );
+      ::exit(1);
+   }
+   if (max && (count > max))
+   {
+      fputs( i18n("Syntax Error: Too many arguments\n").local8Bit(), stderr );
+      ::exit(1);
+   }
+}
+
+bool clientApp::doIt()
+{
+  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  int argc = args->count();
+  checkArgumentCount(argc, 1, 0);
+
+  if ( !args->isSet( "ninteractive" ) ) {
+      s_interactive = false;
+  }
+  QCString command = args->arg(0);
+
+  // read ASN env. variable for non-KApp cases
+  startup_id_str = KStartupInfo::currentStartupIdEnv().id();
+
+  if ( command == "openURL" || command == "newTab" )
+  {
+    KInstance inst(appName);
+    if( !KApplication::dcopClient()->attach())
+    {
+	KApplication::startKdeinit();
+	KApplication::dcopClient()->attach();
+    }
+    checkArgumentCount(argc, 1, 3);
+    bool tempFile = KCmdLineArgs::isTempFileSet();
+    if ( argc == 1 )
+    {
+      KURL url;
+      url.setPath(QDir::homeDirPath());
+      return createNewWindow( url, command == "newTab", tempFile );
+    }
+    if ( argc == 2 )
+    {
+      return createNewWindow( args->url(1), command == "newTab", tempFile );
+    }
+    if ( argc == 3 )
+    {
+      return createNewWindow( args->url(1), command == "newTab", tempFile, QString::fromLatin1(args->arg(2)) );
+    }
+  }
+  else if ( command == "openProfile" )
+  {
+    KInstance inst(appName);
+    if( !KApplication::dcopClient()->attach())
+    {
+	KApplication::startKdeinit();
+	KApplication::dcopClient()->attach();
+    }
+    checkArgumentCount(argc, 2, 3);
+    QString url;
+    if ( argc == 3 )
+      url = args->url(2).url();
+    return openProfile( QString::fromLocal8Bit(args->arg(1)), url );
+  }
+
+  // the following commands need KApplication
+  clientApp app;
+
+  if ( command == "openProperties" )
+  {
+    checkArgumentCount(argc, 2, 2);
+    KPropertiesDialog * p = new KPropertiesDialog( args->url(1) );
+    QObject::connect( p, SIGNAL( destroyed() ), &app, SLOT( quit() ));
+    QObject::connect( p, SIGNAL( canceled() ), &app, SLOT( slotDialogCanceled() ));
+    app.exec();
+    return m_ok;
+  }
+  else if ( command == "exec" )
+  {
+    checkArgumentCount(argc, 1, 3);
+    if ( argc == 1 )
+    {
+      KDesktopIface_stub kdesky( "kdesktop", "KDesktopIface" );
+      kdesky.popupExecuteCommand();
+    }
+    else if ( argc == 2 )
+    {
+      KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ );
+      QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() ));
+      QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() ));
+      app.exec();
+      return !krun_has_error;
+    }
+    else if ( argc == 3 )
+    {
+      KURL::List urls;
+      urls.append( args->url(1) );
+      const KTrader::OfferList offers = KTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ), QString::fromLatin1( "Application" ), QString::null, QString::null );
+      if (offers.isEmpty()) return 1;
+      KService::Ptr serv = offers.first();
+      return KRun::run( *serv, urls );
+    }
+  }
+  else if ( command == "move" )
+  {
+    checkArgumentCount(argc, 2, 0);
+    KURL::List srcLst;
+    for ( int i = 1; i <= argc - 2; i++ )
+      srcLst.append( args->url(i) );
+
+    KIO::Job * job = KIO::move( srcLst, args->url(argc - 1) );
+    if ( !s_interactive )
+        job->setInteractive( false );
+    connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+    app.exec();
+    return m_ok;
+  }
+  else if ( command == "download" )
+  {
+    checkArgumentCount(argc, 0, 0);
+    KURL::List srcLst;
+    if (argc == 1) {
+       while(true) {
+          KURL src = KURLRequesterDlg::getURL();
+          if (!src.isEmpty()) {
+             if (!src.isValid()) {
+                KMessageBox::error(0, i18n("Unable to download from an invalid URL."));
+                continue;
+             }
+             srcLst.append(src);
+          }
+          break;
+       }
+    } else {
+       for ( int i = 1; i <= argc - 1; i++ )
+          srcLst.append( args->url(i) );
+    }
+    if (srcLst.count() == 0)
+       return m_ok;
+    QString dst =
+       KFileDialog::getSaveFileName( (argc<2) ? (QString::null) : (args->url(1).filename()) );
+    if (dst.isEmpty()) // cancelled
+       return m_ok; // AK - really okay?
+    KURL dsturl;
+    dsturl.setPath( dst );
+    KIO::Job * job = KIO::copy( srcLst, dsturl );
+    if ( !s_interactive )
+        job->setInteractive( false );
+    connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+    app.exec();
+    return m_ok;
+  }
+  else if ( command == "copy" )
+  {
+    checkArgumentCount(argc, 2, 0);
+    KURL::List srcLst;
+    for ( int i = 1; i <= argc - 2; i++ )
+      srcLst.append( args->url(i) );
+
+    KIO::Job * job = KIO::copy( srcLst, args->url(argc - 1) );
+    if ( !s_interactive )
+        job->setInteractive( false );
+    connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+    app.exec();
+    return m_ok;
+  }
+  else if ( command == "sortDesktop" )
+  {
+    checkArgumentCount(argc, 1, 1);
+
+    KDesktopIface_stub kdesky( "kdesktop", "KDesktopIface" );
+    kdesky.rearrangeIcons( (int)false );
+
+    return true;
+  }
+  else if ( command == "configure" )
+  {
+    checkArgumentCount(argc, 1, 1);
+    QByteArray data;
+    kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
+    // Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync.
+  }
+  else if ( command == "configureDesktop" )
+  {
+    checkArgumentCount(argc, 1, 1);
+    KDesktopIface_stub kdesky( "kdesktop", "KDesktopIface" );
+    kdesky.configure();
+  }
+  else
+  {
+    fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(QString::fromLocal8Bit(command)).local8Bit().data() );
+    return false;
+  }
+  return true;
+}
+
+void clientApp::slotResult( KIO::Job * job )
+{
+  if (job->error() && s_interactive)
+    job->showErrorDialog();
+  m_ok = !job->error();
+  quit();
+}
+
+void clientApp::slotDialogCanceled()
+{
+    m_ok = false;
+    quit();
+}
+
+#include "kfmclient.moc"
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
new file mode 100644
index 000000000..0d13a6e8c
--- /dev/null
+++ b/konqueror/client/kfmclient.h
@@ -0,0 +1,51 @@
+/* This file is part of the KDE project
+   Copyright (C) 1999 David Faure <faure@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef __kfmclient_h
+#define __kfmclient_h
+
+#include <kapplication.h>
+#include <krun.h>
+
+class clientApp : public KApplication
+{
+  Q_OBJECT
+public:
+  /** Parse command-line arguments and "do it" */
+  static bool doIt();
+
+  /** Make konqueror open a window for @p url */
+  static bool createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype = QString::null);
+
+  /** Make konqueror open a window for @p profile, @p url and @p mimetype */
+  static bool openProfile(const QString & profile, const QString & url, const QString & mimetype = QString::null);
+
+protected slots:
+  void slotResult( KIO::Job * );
+  void delayedQuit();
+  void slotDialogCanceled();
+
+private:
+  static void sendASNChange();
+  static bool m_ok;
+  static QCString startup_id_str;
+
+};
+
+#endif
diff --git a/konqueror/client/kfmclient_3_2.upd b/konqueror/client/kfmclient_3_2.upd
new file mode 100644
index 000000000..0b66c1f19
--- /dev/null
+++ b/konqueror/client/kfmclient_3_2.upd
@@ -0,0 +1,4 @@
+Id=kfmclient_3_2
+File=kfmclientrc,konquerorrc
+Group=Settings,Reusing
+Script=kfmclient_3_2_update.sh,sh
diff --git a/konqueror/client/kfmclient_3_2_update.sh b/konqueror/client/kfmclient_3_2_update.sh
new file mode 100644
index 000000000..6c3adbd15
--- /dev/null
+++ b/konqueror/client/kfmclient_3_2_update.sh
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+while read ln; do
+    if (echo $ln | grep -v "^StartNewKonqueror="); then
+        continue
+    fi
+    if test "$ln" = "StartNewKonqueror=Local only"; then
+        echo "SafeParts=khtml.desktop"
+    elif test "$ln" = "StartNewKonqueror=Web only"; then
+        echo "SafeParts=SAFE"
+    elif test "$ln" = "StartNewKonqueror=Always" \
+            -o "$ln" = "StartNewKonqueror=TRUE" \
+            -o "$ln" = "StartNewKonqueror=true" \
+            -o "$ln" = "StartNewKonqueror=1"; then
+        echo "SafeParts="
+    else # =Never
+        echo "SafeParts=ALL"
+    fi
+done
+
+echo '# DELETE StartNewKonqueror'