[KMess-commits] SF.net SVN: kmess:[6011] trunk/kmess

[<fon...@us...>]

Revision: 6011
          http://kmess.svn.sourceforge.net/kmess/?rev=6011&view=rev
Author:   fontknocker
Date:     2010-05-16 11:36:06 +0000 (Sun, 16 May 2010)

Log Message:
-----------
Fix up a signal in ContactAddedUserDialog plus use the new MsnSession::setCacheDir method.

Modified Paths:
--------------
    trunk/kmess/ChangeLog
    trunk/kmess/src/dialogs/contactaddeduserdialog.h
    trunk/kmess/src/mainwindow.cpp
    trunk/kmess/src/mainwindow.h

Modified: trunk/kmess/ChangeLog
===================================================================
--- trunk/kmess/ChangeLog	2010-05-16 11:35:09 UTC (rev 6010)
+++ trunk/kmess/ChangeLog	2010-05-16 11:36:06 UTC (rev 6011)
@@ -1,3 +1,6 @@
+2010-05-16 (Adam)
+ * Use the new setCacheDir method of MsnSession, plus fix up some signals in ContactAddedUserDialog.
+
 2010-05-15 (Pano)
  * Merged an updated Spanish translation by Mauricio Muñoz Lucero.
 

Modified: trunk/kmess/src/dialogs/contactaddeduserdialog.h
===================================================================
--- trunk/kmess/src/dialogs/contactaddeduserdialog.h	2010-05-16 11:35:09 UTC (rev 6010)
+++ trunk/kmess/src/dialogs/contactaddeduserdialog.h	2010-05-16 11:36:06 UTC (rev 6011)
@@ -64,7 +64,7 @@
 
   signals:
     // Notify of the choice made by the user
-    void          userChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> groups, const int code );
+    void          userChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> groups, int code );
 
 };
 

Modified: trunk/kmess/src/mainwindow.cpp
===================================================================
--- trunk/kmess/src/mainwindow.cpp	2010-05-16 11:35:09 UTC (rev 6010)
+++ trunk/kmess/src/mainwindow.cpp	2010-05-16 11:36:06 UTC (rev 6011)
@@ -1695,8 +1695,8 @@
   // Show a dialog and let the user choose whether to add, allow, or block the contact.
   ContactAddedUserDialog *dialog = new ContactAddedUserDialog( contact );
 
-  connect( dialog, SIGNAL(                       userChoice(contact,QList<KMess::MsnGroup*>,int) ),
-           this,   SLOT  ( slotContactAddedUserDialogChoice(contact,QList<KMess::MsnGroup*>,int) ) );
+  connect( dialog, SIGNAL(                       userChoice( const KMess::MsnContact *,const QList<KMess::MsnGroup*>,int) ),
+           this,   SLOT  ( slotContactAddedUserDialogChoice(const KMess::MsnContact *,const QList<KMess::MsnGroup*>,int) ) );
 
   dialog->show();
 }
@@ -1981,7 +1981,7 @@
 
 
 // The user was presented the "contact added user" dialog and has made a choice
-void MainWindow::slotContactAddedUserDialogChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> &groups, const int code )
+void MainWindow::slotContactAddedUserDialogChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> groups, int code )
 {
 #ifdef KMESSDEBUG_MAINWINDOW
   kDebug() << "Contact" << contact << "added user, who has choosen option:" << code
@@ -2072,8 +2072,8 @@
   changedDisplayPicture();
   
   // the cache file for contact list data
-  QString path = KMessConfig::instance()->getAccountDirectory( account->getHandle() ) + "/contactlist_cache";
-  globalSession->setCacheFile( path );
+  QString path = KMessConfig::instance()->getAccountDirectory( account->getHandle() ) + "/cache";
+  globalSession->setCacheDir( path );
   
   globalSession->logIn( account->getHandle(), passwordToUse, status );
 }

Modified: trunk/kmess/src/mainwindow.h
===================================================================
--- trunk/kmess/src/mainwindow.h	2010-05-16 11:35:09 UTC (rev 6010)
+++ trunk/kmess/src/mainwindow.h	2010-05-16 11:36:06 UTC (rev 6011)
@@ -208,7 +208,7 @@
     // Detect changes in the status of the internet connection
     void                           slotConnectionStatusChanged( Solid::Networking::Status newStatus );
     // The user was presented the "contact added user" dialog and has made a choice
-    void                           slotContactAddedUserDialogChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> &groups, const int code );
+    void                           slotContactAddedUserDialogChoice( const KMess::MsnContact *contact, const QList<KMess::MsnGroup*> groups, int code );
     // Record the network library states
     void                           slotStatusEvent( KMess::StatusMessageType type, KMess::StatusMessage message, QVariant data );
     // Change the status bar message.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.