Menu
▾
▴
[KMess-commits] kmess/kmess/network/applications application.cpp,1.18,1.19 application.h,1.12,1.13 filetransfer.cpp,1.8,1.9 filetransfer.h,1.7,1.8 filetransferp2p.cpp,1.16,1.17 filetransferp2p.h,1.5,1.6 gnomemeeting.cpp,1.10,1.11 gnomemeeting.h,1.3,1.4 mimeapplication.cpp,1.5,1.6 mimeapplication.h,1.3,1.4 msnremotedesktop.cpp,1.8,1.9 msnremotedesktop.h,1.5,1.6 picturetransferp2p.cpp,1.8,1.9 picturetransferp2p.h,1.3,1.4 voiceconversation.cpp,1.6,1.7 voiceconversation.h,1.4,1.5 webapplicationp2p.cpp,1.4,1.5 webapplicationp2p.h,1.2,1.3
|
From: Diederik v. d. B. <cod...@us...> - 2006-04-26 22:00:45
|
Update of /cvsroot/kmess/kmess/kmess/network/applications In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10636/kmess/network/applications Modified Files: application.cpp application.h filetransfer.cpp filetransfer.h filetransferp2p.cpp filetransferp2p.h gnomemeeting.cpp gnomemeeting.h mimeapplication.cpp mimeapplication.h msnremotedesktop.cpp msnremotedesktop.h picturetransferp2p.cpp picturetransferp2p.h voiceconversation.cpp voiceconversation.h webapplicationp2p.cpp webapplicationp2p.h Log Message: Refactored the application/switchboard code, for proper direct connection support. All classes: - updated application constructors. Application changes: - moved contactHandle_ from P2PApplication to base class. - removed localIp, is accessed through CurrentAccount now. - added contact handle to accept/cancel links, so ChatMaster can find the ApplicationList for the contact. FileTransfer/FileTransferP2P changes: - improved messages, added "file could not be read/does not exist" difference. FileTransfer changes: - authCookie_ didn't need to be stored. Index: msnremotedesktop.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/msnremotedesktop.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- msnremotedesktop.cpp 8 Jan 2006 22:31:43 -0000 1.8 +++ msnremotedesktop.cpp 26 Apr 2006 22:00:38 -0000 1.9 @@ -26,8 +26,8 @@ #include "../mimemessage.h" // The constructor -MsnRemoteDesktop::MsnRemoteDesktop(const QString& localIp) - : MimeApplication(localIp) +MsnRemoteDesktop::MsnRemoteDesktop(const QString &contactHandle) + : MimeApplication(contactHandle) { } Index: filetransfer.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/filetransfer.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- filetransfer.h 9 Feb 2006 22:02:16 -0000 1.7 +++ filetransfer.h 26 Apr 2006 22:00:38 -0000 1.8 @@ -39,8 +39,10 @@ Q_OBJECT public: - // The constructor - FileTransfer(const QString& authHandle, const QString& localIp); + // The constructor without filename (sufficient for incoming sessions) + FileTransfer(const QString &contactHandle); + // The constructor with filename to start a session + FileTransfer(const QString &contactHandle, const QString &filename); // The destructor ~FileTransfer(); // Return the application's GUID @@ -84,10 +86,6 @@ private: // Private attributes - // The authorisation cookie for the msnftp connection - QString authCookie_; - // The user's handle - QString authHandle_; // The connection was established bool connectionEstablished_; // The connectivity parameter of the received invitation Index: application.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/application.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- application.h 9 Feb 2006 22:02:16 -0000 1.12 +++ application.h 26 Apr 2006 22:00:38 -0000 1.13 @@ -61,9 +61,11 @@ }; // The constructor - Application(const QString& localIp); + Application(const QString &contactHandle); // The destructor virtual ~Application(); + // Return the handle of the other contact + const QString& getContactHandle() const; // Return the application's identifying cookie const QString& getCookie() const; // A command for the application was received (i.e. "Accept" or "Reject") @@ -72,12 +74,12 @@ int getMode() const; // True if the application was requested to pause the transfer bool isTransferPaused() const; - // Set the current mode of the application - void setMode(ApplicationMode mode); // Request the application to pause the transfer virtual void pauseTransfer(); // Request the application to resume the transfer virtual void resumeTransfer(); + // Set the current mode of the application + void setMode(ApplicationMode mode); // Start the application void start(); // The user cancelled the session @@ -154,8 +156,8 @@ private: // Private attributes // The applications identifying cookie QString cookie_; - // The local IP address - QString localIp_; + // Contact handle + QString contactHandle_; // The current mode ApplicationMode mode_; // A list of used ports Index: picturetransferp2p.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/picturetransferp2p.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- picturetransferp2p.cpp 8 Jan 2006 22:33:07 -0000 1.8 +++ picturetransferp2p.cpp 26 Apr 2006 22:00:38 -0000 1.9 @@ -34,11 +34,10 @@ /** * Constructor * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. */ -PictureTransferP2P::PictureTransferP2P(const QString &localIP, const QString &contactHandle) -: P2PApplication(localIP, contactHandle), +PictureTransferP2P::PictureTransferP2P(ApplicationList *applicationList) +: P2PApplication(applicationList), file_(0) { } @@ -48,12 +47,11 @@ /** * Constructor * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. * @param msnObject MSNObject identifying the picture to request. */ -PictureTransferP2P::PictureTransferP2P(const QString &localIP, const QString &contactHandle, const QString &msnObject) -: P2PApplication(localIP, contactHandle), +PictureTransferP2P::PictureTransferP2P(ApplicationList *applicationList, const QString &msnObject) +: P2PApplication(applicationList), file_(0), msnObject_(msnObject) { Index: mimeapplication.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/mimeapplication.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mimeapplication.h 9 Feb 2006 22:02:16 -0000 1.3 +++ mimeapplication.h 26 Apr 2006 22:00:38 -0000 1.4 @@ -38,7 +38,7 @@ public: // The constructor - MimeApplication(const QString& localIp); + MimeApplication(const QString &contactHandle); // The descructor virtual ~MimeApplication(); Index: voiceconversation.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/voiceconversation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- voiceconversation.h 17 Jul 2005 12:54:42 -0000 1.4 +++ voiceconversation.h 26 Apr 2006 22:00:38 -0000 1.5 @@ -33,7 +33,7 @@ public: // The constructor - VoiceConversation(const QString& localIp); + VoiceConversation(const QString &contactHandle); // The destructor ~VoiceConversation(); // Return the application's GUID Index: filetransferp2p.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/filetransferp2p.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- filetransferp2p.h 9 Feb 2006 22:02:16 -0000 1.5 +++ filetransferp2p.h 26 Apr 2006 22:00:38 -0000 1.6 @@ -42,9 +42,9 @@ public: // The constructor without filename (sufficient for incoming sessions) - FileTransferP2P(const QString &localIP, const QString &contactHandle); + FileTransferP2P(ApplicationList *applicationList); // The constructor with filename to start a session - FileTransferP2P(const QString &localIP, const QString &contactHandle, const QString &filename); + FileTransferP2P(ApplicationList *applicationList, const QString &filename); // The destructor virtual ~FileTransferP2P(); Index: picturetransferp2p.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/picturetransferp2p.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- picturetransferp2p.h 9 Feb 2006 22:02:16 -0000 1.3 +++ picturetransferp2p.h 26 Apr 2006 22:00:38 -0000 1.4 @@ -41,9 +41,9 @@ public: // The constructor without msnobject (sufficient for incoming sessions) - PictureTransferP2P(const QString &localIP, const QString &contactHandle); + PictureTransferP2P(ApplicationList *applicationList); // The constructor with msnobject to start a session - PictureTransferP2P(const QString &localIP, const QString &contactHandle, const QString &msnObject); + PictureTransferP2P(ApplicationList *applicationList, const QString &msnObject); // The destructor virtual ~PictureTransferP2P(); Index: webapplicationp2p.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/webapplicationp2p.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webapplicationp2p.h 9 Feb 2006 22:02:16 -0000 1.2 +++ webapplicationp2p.h 26 Apr 2006 22:00:38 -0000 1.3 @@ -40,10 +40,9 @@ { public: // The constructor without application parameters (sufficient for incoming sessions) - WebApplicationP2P(const QString &localIP, const QString &contactHandle); + WebApplicationP2P(ApplicationList *applicationList); // The constructor with application parameters to start a session -// WebApplicationP2P(const QString &localIP, const QString &contactHandle, -// int applicationId); +// WebApplicationP2P(const QString &contactHandle, int applicationId); // The destructor virtual ~WebApplicationP2P(); Index: msnremotedesktop.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/msnremotedesktop.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- msnremotedesktop.h 9 Feb 2006 22:02:16 -0000 1.5 +++ msnremotedesktop.h 26 Apr 2006 22:00:38 -0000 1.6 @@ -33,7 +33,7 @@ public: // The constructor - MsnRemoteDesktop(const QString& localIp); + MsnRemoteDesktop(const QString &contactHandle); // The destructor ~MsnRemoteDesktop(); // Return the application's GUID Index: webapplicationp2p.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/webapplicationp2p.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- webapplicationp2p.cpp 8 Jan 2006 22:31:23 -0000 1.4 +++ webapplicationp2p.cpp 26 Apr 2006 22:00:38 -0000 1.5 @@ -28,11 +28,10 @@ /** * Constructor * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. */ -WebApplicationP2P::WebApplicationP2P(const QString &localIP, const QString &contactHandle) -: P2PApplication(localIP, contactHandle) +WebApplicationP2P::WebApplicationP2P(ApplicationList *applicationList) +: P2PApplication(applicationList) { } @@ -40,14 +39,12 @@ /* * * Constructor * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. * @param applicationId The ID of the web application to start. */ /* -WebApplicationP2P::WebApplicationP2P(const QString &localIP, const QString &contactHandle, - int applicationId) -: P2PApplication(localIP, contactHandle) +WebApplicationP2P::WebApplicationP2P(const QString &contactHandle, int applicationId) +: P2PApplication(contactHandle) { } */ Index: filetransferp2p.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/filetransferp2p.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- filetransferp2p.cpp 8 Jan 2006 22:51:49 -0000 1.16 +++ filetransferp2p.cpp 26 Apr 2006 22:00:38 -0000 1.17 @@ -38,11 +38,10 @@ /** * The constructor for the FileTransferP2P class, without filename (sufficient for incoming sessions) * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. */ -FileTransferP2P::FileTransferP2P(const QString &localIP, const QString &contactHandle) - : P2PApplication(localIP, contactHandle), +FileTransferP2P::FileTransferP2P(ApplicationList *applicationList) + : P2PApplication(applicationList), file_(0), fileSize_(0), transferPanel_(0) @@ -54,12 +53,11 @@ /** * The constructor for the FileTransferP2P, with filename to start a session * - * @param localIP The IP-Address of the SwitchBoard socket. * @param contactHandle Person to send P2P messages to. * @param filename Filename of the file to send. */ -FileTransferP2P::FileTransferP2P(const QString &localIP, const QString &contactHandle, const QString &filename) - : P2PApplication(localIP, contactHandle), +FileTransferP2P::FileTransferP2P(ApplicationList *applicationList, const QString &filename) + : P2PApplication(applicationList), file_(0), fileName_(filename), fileSize_(0), @@ -157,10 +155,12 @@ // field 6: most likely a splitter mark between the file name and preview fields. It's always 0xFFFFFFFF - unsigned int splitter = P2PMessage::extractBytes(decodedContext, length - 4); + // TODO: fix this detection. + unsigned int splitter = P2PMessage::extractBytes(decodedContext, length); if(splitter != 0xFFFFFFFF) { - kdWarning() << "KMess: File transfer context field has bad formatting, ignoring invite (splitter not found)." << endl; + kdWarning() << "KMess: File transfer context field has bad formatting " + << "(splitter not found, found 0x" << QString::number(splitter,16) << ")." << endl; //return; } @@ -249,7 +249,7 @@ .arg("<font color=red>" + fileName_ + "</font>") ); // Send 500 Internal Error back if we failed (this is still the accept stage) - sendCancelMessage( CANCEL_SESSION ); + sendCancelMessage(CANCEL_SESSION); // Don't quit yet, the SLP error message will be ACKed by the contact. return; @@ -606,15 +606,23 @@ #endif // Notify the user, even if debug mode is not enabled. - kdDebug() << "WARNING - Unable to open file: " << fileName_ << "!" << endl; + kdWarning() << "Unable to open file: " << fileName_ << "!" << endl; // Close the file delete file_; file_ = 0; // Tell the user about it - showMessage( i18n("The transfer of %1 failed. Couldn't open file") - .arg("<font color=red>" + fileName_ + "</font>") ); + if( ! QFile::exists(fileName_) ) + { + showMessage( i18n("The transfer of %1 failed. The file does not exist.") + .arg("<font color=red>" + fileName_ + "</font>") ); + } + else + { + showMessage( i18n("The transfer of %1 failed. The file could not be read.") + .arg("<font color=red>" + fileName_ + "</font>") ); + } return; } Index: mimeapplication.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/mimeapplication.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mimeapplication.cpp 27 Aug 2005 19:42:25 -0000 1.5 +++ mimeapplication.cpp 26 Apr 2006 22:00:38 -0000 1.6 @@ -23,8 +23,8 @@ #include <kdebug.h> // Constructor -MimeApplication::MimeApplication(const QString &localIP) - : Application(localIP) +MimeApplication::MimeApplication(const QString &contactHandle) + : Application(contactHandle) { } @@ -152,12 +152,7 @@ // Send a message to the contact void MimeApplication::sendMessage(const MimeMessage& message) { - MimeMessage mainMessage; - mainMessage.addField("MIME-Version", "1.0"); - mainMessage.addField("Content-Type", "text/x-msmsgsinvite; charset=UTF-8"); - mainMessage.setBody( message.getFields() ); - - emit putMsg( mainMessage ); + emit putMsg( message ); } @@ -200,7 +195,7 @@ message.addField( "Invitation-Cookie", getCookie() ); message.addField( "Cancel-Code", cancelCode ); - sendMessage( message ); + emit putMsg( message ); } Index: application.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/application.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- application.cpp 8 Jan 2006 22:29:44 -0000 1.18 +++ application.cpp 26 Apr 2006 22:00:37 -0000 1.19 @@ -27,9 +27,9 @@ #include "../mimemessage.h" // The constructor -Application::Application(const QString& localIp) +Application::Application(const QString &contactHandle) : QObject(0, "*Application"), - localIp_(localIp), + contactHandle_(contactHandle), mode_(APP_MODE_NORMAL), userAccepted_(false), userStartedApp_(true), @@ -173,6 +173,14 @@ +// Return the handle of the other contact. +const QString& Application::getContactHandle() const +{ + return contactHandle_; +} + + + // Return the application's identifying cookie const QString& Application::getCookie() const { @@ -185,7 +193,7 @@ const QString& Application::getExternalIp() const { // A wrapper for now, makes the Application API easier to use. - return CurrentAccount::instance()->getExternalIP(); + return CurrentAccount::instance()->getExternalIp(); } @@ -193,7 +201,8 @@ // Return the local IP address const QString& Application::getLocalIp() const { - return localIp_; + // A wrapper for now, makes the Application API easier to use. + return CurrentAccount::instance()->getLocalIp(); } @@ -281,8 +290,8 @@ html += appHtml; html += " "; html += i18n( "Do you want to <a href=%1>accept</a> or <a href=%2>cancel</a>?" ) - .arg( "\"kmess://accept?" + getCookie() + "\"" ) - .arg( "\"kmess://reject?" + getCookie() + "\"" ); + .arg( "\"kmess://accept/" + getContactHandle() + "?" + getCookie() + "\"" ) + .arg( "\"kmess://reject/" + getContactHandle() + "?" + getCookie() + "\"" ); html += "</font>"; // Send the message to the chat window. @@ -309,7 +318,7 @@ // Create the message, starting with the application's particulars html += appHtml + " "; html += i18n("Click to <a href=%1>cancel</a>.") - .arg( "\"kmess://cancel?" + getCookie() + "\"" ); + .arg( "\"kmess://cancel/" + getContactHandle() + "?" + getCookie() + "\"" ); // Send the message to the chat window. showMessage( html ); Index: filetransfer.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/filetransfer.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- filetransfer.cpp 29 Jan 2006 21:20:10 -0000 1.8 +++ filetransfer.cpp 26 Apr 2006 22:00:38 -0000 1.9 @@ -41,10 +41,10 @@ #define KMESSDEBUG_FILETRANSFER_GENERAL #endif -// The constructor -FileTransfer::FileTransfer(const QString& authHandle, const QString& localIp) - : MimeApplication(localIp) - , authHandle_(authHandle) + +// The constructor without filename (sufficient for incoming sessions) +FileTransfer::FileTransfer(const QString &contactHandle) + : MimeApplication(contactHandle) , connectionEstablished_(false) , connectivity_('?') , file_(0) @@ -54,6 +54,18 @@ } +// The constructor with filename to start a session +FileTransfer::FileTransfer(const QString &contactHandle, const QString &filename) + : MimeApplication(contactHandle) + , connectionEstablished_(false) + , connectivity_('?') + , file_(0) + , fileName_(filename) + , msnFtpConnection_(0) + , transferPanel_(0) +{ + +} // The destructor @@ -206,6 +218,7 @@ int port; int portXInternal; int portX; + QString authCookie; // Pull the IP, port, and authorization info from the message ip = message.getValue( "IP-Address" ); @@ -213,7 +226,7 @@ portXInternal = message.getValue( "PortX-Internal" ).toInt(); // As of MSN5 port = message.getValue( "Port" ).toInt(); portX = message.getValue( "PortX" ).toInt(); // As of MSN5 - authCookie_ = message.getValue( "AuthCookie" ); + authCookie = message.getValue( "AuthCookie" ); /* * This is an attempt to get file transfers @@ -235,8 +248,8 @@ * Using IP-Address on Port and IP-Address-Internal on PortX-Internal should be sufficient. */ - QString externalIP = getExternalIp(); - if(ip == externalIP) + QString externalIp = getExternalIp(); + if(ip == externalIp) { // The other client must be at the same network..! // Try to connect internally. @@ -253,12 +266,12 @@ #ifdef KMESSDEBUG_FILETRANSFER_GENERAL - kdDebug() << "FileTransfer - IP: " << ip << " Port: " << port << " AuthCookie: " << authCookie_ << endl; + kdDebug() << "FileTransfer - IP: " << ip << " Port: " << port << " AuthCookie: " << authCookie << endl; #endif // Initialize the MSNFTP connection msnFtpConnection_ = new MsnFtpConnection(); - msnFtpConnection_->setAuthInfo( CurrentAccount::instance()->getHandle(), authCookie_ ); + msnFtpConnection_->setAuthInfo( CurrentAccount::instance()->getHandle(), authCookie ); connectMsnFtpConnection(); // Initialize the progess dialog @@ -520,41 +533,39 @@ #ifdef KMESSDEBUG_FILETRANSFER_GENERAL kdDebug() << "FileTransfer - userStarted1_UserInvitesContact" << endl; #endif +#ifdef KMESSTEST + ASSERT( ! fileName_.isEmpty() ); +#endif QString sizeString; MimeMessage message; - // Show a dialog to get a file path from the user. - fileName_ = KFileDialog::getOpenFileName( ); - if(fileName_.isEmpty()) return; // user pressed cancel - - // Get a short file name + // Get a short file name so slotMsnFtpStatusMessage() can use that. shortFileName_ = fileName_.right( fileName_.length() - fileName_.findRev('/') - 1 ); - // Check if the file truly exists - if(! QFile::exists(fileName_)) - { - // Fake an event - // No need to show a progress-dialog message, isn't not created here yet - slotMsnFtpStatusMessage( i18n("The transfer of %1 failed. The file doesn't exist."), MsnFtpConnection::STATUS_CHAT ); - endApplication(); - return; - } - - // Create a file object file_ = new QFile(fileName_); // Open the file for reading bool open = file_->open(IO_ReadOnly); - if ( !open ) + if( ! open ) { + // Notify the user, even if debug mode is not enabled. + kdWarning() << "Unable to open file: " << fileName_ << "!" << endl; + // Important: undo what we created delete file_; - file_ = 0; - fileName_ = QString::null; + file_ = 0; // Leave - slotMsnFtpStatusMessage( i18n("The transfer of %1 failed. Couldn't open file."), MsnFtpConnection::STATUS_CHAT ); + if( ! QFile::exists(fileName_) ) + { + slotMsnFtpStatusMessage( i18n("The transfer of %1 failed. The file does not exist."), MsnFtpConnection::STATUS_CHAT ); + } + else + { + slotMsnFtpStatusMessage( i18n("The transfer of %1 failed. The file could not be read."), MsnFtpConnection::STATUS_CHAT ); + } + endApplication(); return; } @@ -594,16 +605,17 @@ QString html; QString portString; + QString authCookie; // Create a message showing that the transfer was accepted. showEventMessage( i18n("Transfer accepted.") ); // Get the authorisation cookie to use - authCookie_ = generateCookie(); + authCookie = generateCookie(); // Initialize the msnftp connection class msnFtpConnection_ = new MsnFtpConnection(); - msnFtpConnection_->setAuthInfo(authHandle_, authCookie_); + msnFtpConnection_->setAuthInfo(getContactHandle(), authCookie); connectMsnFtpConnection(); // Get the IP,port to use @@ -628,7 +640,7 @@ response.addField( "Port", portString ); // response.addField( "PortX", portString ); response.addField( "Launch-Application", "FALSE" ); - response.addField( "AuthCookie", authCookie_ ); + response.addField( "AuthCookie", authCookie ); sendMessage( response ); } Index: gnomemeeting.h =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/gnomemeeting.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gnomemeeting.h 9 Feb 2006 22:02:16 -0000 1.3 +++ gnomemeeting.h 26 Apr 2006 22:00:38 -0000 1.4 @@ -36,7 +36,7 @@ public: // The constructor - GnomeMeeting(const QString& localIp); + GnomeMeeting(const QString &contactHandle); // The destructor ~GnomeMeeting(); // Return the application's GUID Index: gnomemeeting.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/gnomemeeting.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gnomemeeting.cpp 8 Jan 2006 22:31:43 -0000 1.10 +++ gnomemeeting.cpp 26 Apr 2006 22:00:38 -0000 1.11 @@ -26,8 +26,8 @@ #include "../mimemessage.h" // The constructor -GnomeMeeting::GnomeMeeting(const QString& localIp) - : MimeApplication(localIp) +GnomeMeeting::GnomeMeeting(const QString &contactHandle) +: MimeApplication(contactHandle) { } Index: voiceconversation.cpp =================================================================== RCS file: /cvsroot/kmess/kmess/kmess/network/applications/voiceconversation.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- voiceconversation.cpp 8 Jan 2006 22:31:43 -0000 1.6 +++ voiceconversation.cpp 26 Apr 2006 22:00:38 -0000 1.7 @@ -35,8 +35,8 @@ unsigned SIP_LISTEN_PORT = 5060; unsigned RTP_LISTEN_PORT = 10000; -VoiceConversation::VoiceConversation(const QString& localIp) - : MimeApplication(localIp), +VoiceConversation::VoiceConversation(const QString &contactHandle) + : MimeApplication(contactHandle), userAgent_(0) { |