1 files changed, 6 insertions, 14 deletions

diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp
index c51f18a..389c836 100644
--- a/noncore/comm/keypebble/krfbconnection.cpp
+++ b/noncore/comm/keypebble/krfbconnection.cpp
@@ -5,7 +5,7 @@
 
 #include "krfbconnection.h"
 #include "krfblogin.h"
-#include "krfboptions.h"
+#include "krfbserver.h"
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
 
@@ -16,7 +16,7 @@ KRFBConnection::KRFBConnection( QObject *parent )
   currentState_ = Disconnected;
   sock = 0;
   minData_ = 0;
-  options_ = new KRFBOptions();
+		options_ = new KRFBServer();
   updater = 0;
   decoder_ = 0;
   buffer_ = 0;
@@ -30,13 +30,12 @@ KRFBConnection::~KRFBConnection()
   delete options_;
 }
 
-void KRFBConnection::connectTo( const QCString &host, int display )
+void KRFBConnection::connectTo( KRFBServer server)
 {
-  if ( currentState_ != Disconnected );
+		if ( currentState_ != Disconnected )
     disconnect();
 
-  this->host_= host;
-  this->display_ = display;
+    (*options_)=server;
 
   sock = new QSocket( this, "rfbSocket" );
   CHECK_PTR( sock );
@@ -48,7 +47,7 @@ void KRFBConnection::connectTo( const QCString &host, int display )
   qWarning( "Connecting..." );
 
   currentState_ = Connecting;
-  sock->connectToHost( host_, portBase_ + display_ );
+		sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display );
 }
 
 void KRFBConnection::disconnect()
@@ -70,7 +69,6 @@ void KRFBConnection::disconnect()
 
 void KRFBConnection::disconnectDone()
 {
-  qWarning( "KRFBConnection disconnected" );
   currentState_ = Disconnected;
   delete sock;
   sock = 0;
@@ -180,7 +178,6 @@ void KRFBConnection::waitForData( unsigned int sz )
   }
   else {
       //    qWarning( "Waiting for %u bytes", sz );
-    
     minData_ = sz;
     connect( sock, SIGNAL( readyRead() ), SLOT( gotMoreData() ) );
   }
@@ -211,11 +208,6 @@ int KRFBConnection::portBase() const
   return portBase_;
 }
 
-void KRFBConnection::setPassword( const QCString &pass )
-{
-  this->pass_ = pass;
-}
-
 void KRFBConnection::updateTimer()
 {
   decoder_->sendUpdateRequest( true );