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

List:       kde-commits
Subject:    kdenetwork/kopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-03-30 22:55:27
Message-ID: 20050330225527.D11CA4A6 () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Make the saving of the contactlist working when closing Kopete


  M +0 -9      kopete/kopeteapplication.cpp   1.194
  M +0 -1      kopete/kopeteapplication.h   1.87
  M +12 -2     libkopete/kopetepluginmanager.cpp   1.44


--- kdenetwork/kopete/kopete/kopeteapplication.cpp  #1.193:1.194
@@ -89,6 +89,4 @@ KopeteApplication::KopeteApplication()
         //Create the emoticon installer
         m_emoticonHandler = new Kopete::EmoticonMimeTypeHandler;
-
-        QObject::connect( this, SIGNAL( aboutToQuit() ), SLOT( slotCleanShutdown() ) );
 }
 
@@ -318,12 +316,5 @@ void KopeteApplication::quitKopete()
 }
 
-void KopeteApplication::slotCleanShutdown()
-{
-        // save the contact list now, just in case a change was made very recently
-        // and it hasn't autosaved yet
-        Kopete::ContactList::self()->save();
-        Kopete::AccountManager::self()->save();
 
-}
 void KopeteApplication::commitData( QSessionManager &sm )
 {

--- kdenetwork/kopete/kopete/kopeteapplication.h  #1.86:1.87
@@ -77,5 +77,4 @@ private slots:
          */
         void slotAllPluginsLoaded();
-        void slotCleanShutdown();
 private:
         // The main window might get deleted behind our back (W_DestructiveClose),

--- kdenetwork/kopete/libkopete/kopetepluginmanager.cpp  #1.43:1.44
@@ -44,5 +44,6 @@
 
 #include "kopeteplugin.h"
-
+#include "kopetecontactlist.h"
+#include "kopeteaccountmanager.h"
 
 namespace Kopete
@@ -161,5 +162,14 @@ KPluginInfo *PluginManager::pluginInfo( 
 void PluginManager::shutdown()
 {
-        kdDebug( 14010 ) << k_funcinfo << kdBacktrace() << endl;
+//      kdDebug( 14010 ) << k_funcinfo << kdBacktrace() << endl;
+
+        /* save the contact list now, just in case a change was made very recently
+           and it hasn't autosaved yet
+           from a OO point of view, theses lines should not be there, but i don't
+           see better place -Olivier
+        */
+        Kopete::ContactList::self()->save();
+        Kopete::AccountManager::self()->save();
+        
         
         d->shutdownMode = Private::ShuttingDown;


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