[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/libkopete
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-12-31 15:31:29
Message-ID: 20031231153129.00A5A93DE () office ! kde ! org
[Download RAW message or body]

CVS commit by mklingens: 

More verbose warning when we do trigger it; don't fire the warning if there's
nothing wrong


  M +10 -0     kopetepluginmanager.cpp   1.29


--- kdenetwork/kopete/libkopete/kopetepluginmanager.cpp  #1.28:1.29
@@ -200,5 +200,15 @@ void KopetePluginManager::slotPluginRead
 void KopetePluginManager::slotShutdownTimeout()
 {
+        // When we were already done the timer might still fire.
+        // Do nothing in that case.
+        if ( d->shutdownMode == KopetePluginManagerPrivate::DoneShutdown )
+                return;
+
+        QStringList remaining;
+        for ( QMap<KPluginInfo *, KopetePlugin *>::ConstIterator it = \
d->loadedPlugins.begin(); it != d->loadedPlugins.end(); ++it ) +                \
remaining.append( it.data()->pluginId() ); +
         kdWarning( 14010 ) << k_funcinfo << "Some plugins didn't shutdown in time!" \
<< endl +                << "Remaining plugins: " << remaining.join( \
QString::fromLatin1( ", " ) ) << endl  << "Forcing Kopete shutdown now." << endl;
 


[prev in list] [next in list] [prev in thread] [next in thread]