Import release 2.0rc1

src/chat/chatmaster.cpp

@@ -26,10 +26,8 @@
 #include "../network/applications/p2papplication.h"
 #include "../network/applications/filetransfer.h"
 #include "../network/applications/filetransferp2p.h"
-#include "../network/applications/gnomemeeting.h"
 #include "../network/applications/inktransferp2p.h"
 #include "../network/applications/msnobjecttransferp2p.h"
-#include "../network/applications/webcamtransferp2p.h"
 #include "../network/chatmessage.h"
 #include "../network/msnswitchboardconnection.h"
 #include "../currentaccount.h"
@@ -768,7 +766,7 @@ void ChatMaster::raiseChat( Chat *chat, bool force )
   // Bypass focus stealing prevention (code from Quassel)
   QX11Info::setAppUserTime( QX11Info::appTime() );
 #endif
-  
+
   // Workaround a bug in KWin: force the window to get focus
   if( chatWindow->windowState() & Qt::WindowMinimized) {
     chatWindow->setWindowState( (chatWindow->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive );
@@ -1014,9 +1012,6 @@ void ChatMaster::showMsnObject( const QString &handle, const MsnObject &msnObjec
     case MsnObject::BACKGROUND:
       // handle background transfers
 
-    case MsnObject::VOICECLIP:
-      // handle voicelip transfers
-
     default:
       kWarning() << "Unable to handle MsnObject pictures of type '" << msnObject.getType() << "'.";
   }
@@ -1704,10 +1699,6 @@ Chat *ChatMaster::createChat( MsnSwitchboardConnection *switchboard, bool reques
            this,    SLOT  (    slotDeliverAppCommand(QString,QString,QString)       ) );
   connect( newChat, SIGNAL(      requestFileTransfer(const QString&,const QString&) ),
            this,    SLOT  (        startFileTransfer(const QString&,const QString&) ) );
-  connect( newChat, SIGNAL(        requestNetMeeting(const QString&)                ),
-           this,    SLOT  (          startNetMeeting(const QString&)                ) );
-  connect( newChat, SIGNAL(    requestWebcamTransfer(const QString&)                ),
-           this,    SLOT  (      startWebcamTransfer(const QString&)                ) );
   connect( newChat, SIGNAL(                  closing(Chat*)                         ),
            this,    SLOT  (          slotChatClosing(Chat*)                         ) );
   connect( newChat, SIGNAL(                destroyed(QObject*)                      ),
@@ -1888,24 +1879,6 @@ void ChatMaster::startChatAndFileTransfer( const QString &handle, const QString
 
 
 
-// Start a netmeeting invitation
-void ChatMaster::startNetMeeting(const QString &handle)
-{
-  // Get the application list
-  ApplicationList *appList = getApplicationList(handle);
-  if(KMESS_NULL(appList)) return;
-
-  // Get the contact
-  const ContactBase *contact = currentAccount_->getContactByHandle( handle );
-  if(KMESS_NULL(contact)) return;
-
-  // Create the application
-  MimeApplication *app = new GnomeMeeting(handle);
-  startApplication(app);
-}
-
-
-
 // Start a msnobject transfer to get the contact's msn object.
 void ChatMaster::startMsnObjectDownload( const QString &handle, const MsnObject *msnObject, Chat *chat )
 {
@@ -1974,27 +1947,6 @@ void ChatMaster::startMsnObjectDownload( const QString &handle, const MsnObject
 
 
 
-// Start a webcam transfer with the contact
-void ChatMaster::startWebcamTransfer( const QString &handle )
-{
-  ApplicationList *appList = getApplicationList(handle);
-  if(KMESS_NULL(appList)) return;
-
-  // Get the contact properties, see how we can transfer the file.
-  const ContactBase *contact = currentAccount_->getContactByHandle( handle );
-  if( contact == 0 || ! contact->hasP2PSupport() )
-  {
-    kWarning() << "Contact" << handle << "does not support P2P transfers, using old MIME invitations instead.";
-    return;
-  }
-
-  // The contact supports file transfer over MSNP2P
-  P2PApplication *app = new WebcamTransferP2P(appList);
-  startApplication(app);
-}
-
-
-
 /**
  * Periodically called method for update commands.
  *