Attachment #2238 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All




   if (!dcopClient->call(_launcher, _launcher,
        function, params, replyType, replyData))
   {
			if (error)
			   *error = i18n("KLauncher could not be reached via DCOP.\n");
			if (!kapp)
			   delete dcopClient;
			return -1;
	   }
	   if (replyType != "serviceResult")
      {
	      kdDebug() << "kapplication: dcopClient() returned wrong type. Reply type: " << replyType << endl;
         noWait = true;
      }

   if (!kapp)
      delete dcopClient;






Slave* Slave::createSlave( const QString &protocol, const KURL& url, int& error, QString& error_text )
{
    kdDebug(7002) << "createSlave '" << protocol << "' for " << url.prettyURL() << endl;
    // Firstly take into account all special slaves
    if (protocol == "data")
        return new DataProtocol();

    stream << protocol << url.host() << socketfile.name();

    QCString launcher = KApplication::launcher();
   // FIXME: there is a bug in dcop that makes it reply requests out
   // of order and the messages are then wrongly delivered.
   // We didn't find the proper fix, so we are just trying more than once
   // to make the call praying for it to reply correctly.

   if (!client->call(launcher, launcher, "requestSlave(QString,QString,QString)", params, replyType, reply)) 
   {
      kdDebug() << "slave: 1 - requestSlave() returned wrong type = " << replyType << endl;
      error_text = i18n("Cannot talk to klauncher");
      error = KIO::ERR_SLAVE_DEFINED;
      delete slave;
      return 0;
   }
   
   if (replyType == "QString")
   {
      QDataStream stream2(reply, IO_ReadOnly);
      QString errorStr;
      pid_t pid;
      stream2 >> pid >> errorStr;
      if (!pid)
      {
         error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);
         error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
         delete slave;
         return 0;
      }
#ifndef Q_WS_WIN
      slave->setPID(pid);
      QTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, SLOT(timeout()));
#endif
   }
   else
      kdDebug() << "slave: 2 - requestSlave() returned wrong type = " << replyType << endl;
   return slave;
}

Slave* Slave::holdSlave( const QString &protocol, const KURL& url )

Return to bug 1499

Lines 2626-2637 Link Here

(-)kdelibs-3.5.4/kdecore/kapplication.cpp.orig (-6 / +12 lines)
2626	if (!dcopClient->call(_launcher, _launcher,	2626	if (!dcopClient->call(_launcher, _launcher,
2627	function, params, replyType, replyData))	2627	function, params, replyType, replyData))
2628	{	2628	{
2629	if (error)	2629	if (error)
2630	*error = i18n("KLauncher could not be reached via DCOP.\n");	2630	*error = i18n("KLauncher could not be reached via DCOP.\n");
2631	if (!kapp)	2631	if (!kapp)
2632	delete dcopClient;	2632	delete dcopClient;
2633	return -1;	2633	return -1;
2634	}	2634	}
		2635	if (replyType != "serviceResult")
		2636	{
		2637	kdDebug() << "kapplication: dcopClient() returned wrong type. Reply type: " << replyType << endl;
		2638	noWait = true;
		2639	}
		2640
2635	if (!kapp)	2641	if (!kapp)
2636	delete dcopClient;	2642	delete dcopClient;
2637		2643

Lines 354-360 Link Here

(-)kdelibs-3.5.4/kio/kio/slave.cpp.dcop_wrong_reply (-22 / +34 lines)
354		354
355	Slave* Slave::createSlave( const QString &protocol, const KURL& url, int& error, QString& error_text )	355	Slave* Slave::createSlave( const QString &protocol, const KURL& url, int& error, QString& error_text )
356	{	356	{
357	//kdDebug(7002) << "createSlave '" << protocol << "' for " << url.prettyURL() << endl;	357	kdDebug(7002) << "createSlave '" << protocol << "' for " << url.prettyURL() << endl;
358	// Firstly take into account all special slaves	358	// Firstly take into account all special slaves
359	if (protocol == "data")	359	if (protocol == "data")
360	return new DataProtocol();	360	return new DataProtocol();
Lines 432-460 Link Here
432	stream << protocol << url.host() << socketfile.name();	432	stream << protocol << url.host() << socketfile.name();
433		433
434	QCString launcher = KApplication::launcher();	434	QCString launcher = KApplication::launcher();
435	if (!client->call(launcher, launcher, "requestSlave(QString,QString,QString)",	435	// FIXME: there is a bug in dcop that makes it reply requests out
436	params, replyType, reply)) {	436	// of order and the messages are then wrongly delivered.
437	error_text = i18n("Cannot talk to klauncher");	437	// We didn't find the proper fix, so we are just trying more than once
438	error = KIO::ERR_SLAVE_DEFINED;	438	// to make the call praying for it to reply correctly.
439	delete slave;	439
440	return 0;	440	if (!client->call(launcher, launcher, "requestSlave(QString,QString,QString)", params, replyType, reply))
441	}	441	{
442	QDataStream stream2(reply, IO_ReadOnly);	442	kdDebug() << "slave: 1 - requestSlave() returned wrong type = " << replyType << endl;
443	QString errorStr;	443	error_text = i18n("Cannot talk to klauncher");
444	pid_t pid;	444	error = KIO::ERR_SLAVE_DEFINED;
445	stream2 >> pid >> errorStr;	445	delete slave;
446	if (!pid)	446	return 0;
447	{	447	}
448	error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);	448
449	error = KIO::ERR_CANNOT_LAUNCH_PROCESS;	449	if (replyType == "QString")
450	delete slave;	450	{
451	return 0;	451	QDataStream stream2(reply, IO_ReadOnly);
452	}	452	QString errorStr;
		453	pid_t pid;
		454	stream2 >> pid >> errorStr;
		455	if (!pid)
		456	{
		457	error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);
		458	error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
		459	delete slave;
		460	return 0;
		461	}
453	#ifndef Q_WS_WIN	462	#ifndef Q_WS_WIN
454	slave->setPID(pid);	463	slave->setPID(pid);
455	QTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, SLOT(timeout()));	464	QTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, SLOT(timeout()));
456	#endif	465	#endif
457	return slave;	466	}
		467	else
		468	kdDebug() << "slave: 2 - requestSlave() returned wrong type = " << replyType << endl;
		469	return slave;
458	}	470	}
459		471
460	Slave* Slave::holdSlave( const QString &protocol, const KURL& url )	472	Slave* Slave::holdSlave( const QString &protocol, const KURL& url )