File r881699-kopete-logout.diff of Package kdenetwork4

Overview Repositories Revisions Requests Users Attributes Meta

File r881699-kopete-logout.diff of Package kdenetwork4

Index: kopete/libkopete/kopetepluginmanager.cpp
===================================================================
--- kopete/libkopete/kopetepluginmanager.cpp	(revision 881698)
+++ kopete/libkopete/kopetepluginmanager.cpp	(revision 881699)
@@ -62,14 +62,17 @@
 		if ( shutdownMode != DoneShutdown )
 			kWarning( 14010 ) << "Destructing plugin manager without going through the shutdown process! Backtrace is: " << endl << kBacktrace();
 
-		// Quick cleanup of the remaining plugins, hope it helps
-		// Note that deleting it.value() causes slotPluginDestroyed to be called, which
-		// removes the plugin from the list of loaded plugins.
+		// Clean up loadedPlugins manually, because PluginManager can't access our global
+		// static once this destructor has started.
 		while ( !loadedPlugins.empty() )
 		{
 			InfoToPluginMap::ConstIterator it = loadedPlugins.begin();
 			kWarning( 14010 ) << "Deleting stale plugin '" << it.value()->objectName() << "'";
-			delete it.value();
+			KPluginInfo info = it.key();
+			Plugin *plugin = it.value();
+			loadedPlugins.remove(info);
+			plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*)));
+			delete plugin;
 		}
 	}
 
@@ -245,10 +248,6 @@
 {
 	kDebug( 14010 ) ;
 
-	// Disconnect any remaining plugins (bug 172011).
-	for ( PluginManagerPrivate::InfoToPluginMap::ConstIterator it = _kpmp->loadedPlugins.begin(); it != _kpmp->loadedPlugins.end(); ++it )
-		disconnect( it.value(), SIGNAL(destroyed(QObject*)), this, 0 );
-
 	_kpmp->shutdownMode = PluginManagerPrivate::DoneShutdown;
 
 	KGlobal::deref();

Places

File r881699-kopete-logout.diff of Package kdenetwork4

Places