Import release 2.0rc1

src/network/applications/applicationlist.cpp

@@ -29,15 +29,10 @@
 #include "../p2pmessage.h"
 #include "filetransfer.h"
 #include "filetransferp2p.h"
-#include "gnomemeeting.h"
 #include "inktransferp2p.h"
 #include "mimeapplication.h"
 #include "msnobjecttransferp2p.h"
-#include "msnremotedesktop.h"
 #include "p2papplication.h"
-#include "voiceconversation.h"
-#include "webapplicationp2p.h"
-#include "webcamtransferp2p.h"
 
 #include <QRegExp>
 
@@ -607,24 +602,10 @@ MimeApplication * ApplicationList::createApplicationByGuid(const QString &appGui
   kDebug() << "Creating MimeApplication for GUID" << appGuid;
 #endif
 
-  if( appGuid == GnomeMeeting::getAppId() )
-  {
-    return new GnomeMeeting( contactHandle_ );
-  }
-  else if( appGuid == MsnRemoteDesktop::getAppId() )
-  {
-    return new MsnRemoteDesktop( contactHandle_ );
-  }
-  else if( appGuid == FileTransfer::getAppId() )
+  if( appGuid == FileTransfer::getAppId() )
   {
     return new FileTransfer( contactHandle_ );
   }
-  else if( appGuid == VoiceConversation::getAppId() )
-  {
-    // TODO: check if there is already an active audio conversation.
-    // i18n("The contact is inviting you to start an audio conversation, but you can't have more then one audio conversation at the same time.")) );
-    return new VoiceConversation( contactHandle_ );
-  }
   else
   {
 #ifdef KMESSDEBUG_APPLICATIONLIST_GENERAL
@@ -655,18 +636,6 @@ P2PApplication * ApplicationList::createApplicationByEufGuid(const QString &eufG
   {
     return new FileTransferP2P( this );
   }
-  else if( eufGuid == WebApplicationP2P::getAppId() )
-  {
-    return new WebApplicationP2P( this );
-  }
-  else if( eufGuid == WebcamTransferP2P::getPullAppId() )
-  {
-    return new WebcamTransferP2P( this );
-  }
-  else if( eufGuid == WebcamTransferP2P::getPushAppId() )
-  {
-    return new WebcamTransferP2P( this );
-  }
   else
   {
 #ifdef KMESSDEBUG_APPLICATIONLIST_GENERAL