[Pkg-silc-commits] r207 - in /kopete-silc-plugin/trunk: README debian/changelog src/silcaccount.cpp src/silcservercontact.cpp

[stesie-guest at users.alioth.debian.org]

Author: stesie-guest
Date: Wed Dec 26 14:41:27 2007
New Revision: 207

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=207
Log:
Update to kopete_silc-0.4.

Modified:
    kopete-silc-plugin/trunk/README
    kopete-silc-plugin/trunk/debian/changelog
    kopete-silc-plugin/trunk/src/silcaccount.cpp
    kopete-silc-plugin/trunk/src/silcservercontact.cpp

Modified: kopete-silc-plugin/trunk/README
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk/README?rev=207&op=diff
==============================================================================
--- kopete-silc-plugin/trunk/README (original)
+++ kopete-silc-plugin/trunk/README Wed Dec 26 14:41:27 2007
@@ -37,12 +37,12 @@
 I N S T A L L A T I O N   :=
 
   kopete_silc doesn't rely on the quite common GNU Autoconf build
-  environment but CMake, like quite a lot of other KDE programs do
+  environment but CMake, like quite a lot of other KDE programs do.
 
   Furthermore you need to have libsilc 1.1 installed.
 
   Since you read this, you probably succeeded in checking out your
-  very own copy from CVS, thus you've got all what you need to have to
+  very own copy from Git, thus you've got all what you need to have to
   successfully start out:
 
   First enter
@@ -55,8 +55,8 @@
 	make
 	make install
 
-  If it does not work, please fix and tell what was wrong. Don't just
-  cry and shout for help...
+  If it does not work, please fix and tell what was wrong.  Don't just
+  cry and shout for help.
 
   Since installation usually goes below /usr/local/ you probably want
   to add this directory to your KDEDIRS, if it is not already. Do so
@@ -82,12 +82,11 @@
   your contributions are welcome, 
   please help in improving kopete_silc.
 
-  If you want CVS access to brokenpipe.de repository, please ask.
+  If you need write access to brokenpipe.de Git repository, please ask.
 
 
 
-
-Cheers,
+cheers,
   Stefan Siegl <stesie at brokenpipe.de>
 
-$Id: README,v 1.7 2007-05-28 16:52:07 stesie Exp $
+

Modified: kopete-silc-plugin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk/debian/changelog?rev=207&op=diff
==============================================================================
--- kopete-silc-plugin/trunk/debian/changelog (original)
+++ kopete-silc-plugin/trunk/debian/changelog Wed Dec 26 14:41:27 2007
@@ -1,3 +1,9 @@
+kopete-silc-plugin (0.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stefan Siegl <stesie at brokenpipe.de>  Wed, 26 Dec 2007 15:25:22 +0100
+
 kopete-silc-plugin (0.3-3) unstable; urgency=low
 
   * Depend on libsilc-1.1-2 to get security fixes from the last version.

Modified: kopete-silc-plugin/trunk/src/silcaccount.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk/src/silcaccount.cpp?rev=207&op=diff
==============================================================================
--- kopete-silc-plugin/trunk/src/silcaccount.cpp (original)
+++ kopete-silc-plugin/trunk/src/silcaccount.cpp Wed Dec 26 14:41:27 2007
@@ -875,8 +875,10 @@
                              void *context)
 {
   if(! _conn) return;
+  if(! _client) return;
+
   kdDebug() << "SILCCommand: " << command.latin1() << endl;
-  assert(_client);
+
   SilcTK::SilcUInt16 cmd_ident = 
     SilcTK::silc_client_command_call(_client, _conn, command.latin1());
   if (reply)
@@ -941,13 +943,22 @@
     }
     account->updateAttributes();
 
+    // mark server window contact online
+    account->myServer()->setOnlineStatus
+      (SilcProtocol::protocol()->statusOnline);
+
     // emit connected signal ...
     emit account->connected();
     break;
+
   case SilcTK::SILC_CLIENT_CONN_DISCONNECTED:
     kdDebug() << "client: disconnected" << endl;
     account->_conn = 0;
     account->setOnlineStatus(SilcProtocol::protocol()->statusOffline);
+
+    // mark server window contact offline
+    account->myServer()->setOnlineStatus
+      (SilcProtocol::protocol()->statusOffline);
 
     emit account->disconnected();
 
@@ -977,6 +988,7 @@
        i18n("Unable to establish connection to the remote host: %1")
        .arg(error_msg), i18n("Kopete SilcTK::SILC Plugin"));
     account->_conn = 0;
+    account->setOnlineStatus(SilcProtocol::protocol()->statusOffline);
     break;
   }
 }

Modified: kopete-silc-plugin/trunk/src/silcservercontact.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk/src/silcservercontact.cpp?rev=207&op=diff
==============================================================================
--- kopete-silc-plugin/trunk/src/silcservercontact.cpp (original)
+++ kopete-silc-plugin/trunk/src/silcservercontact.cpp Wed Dec 26 14:41:27 2007
@@ -73,9 +73,22 @@
 }
 
 void 
-SilcServerContact::slotSendMessage(Kopete::Message &, Kopete::ChatSession *)
+SilcServerContact::slotSendMessage(Kopete::Message &msg,
+				   Kopete::ChatSession *session)
 {
-  
+  if(session != manager())
+    return;
+
+  QString cmd = msg.plainBody();
+  if(cmd[0] == QChar('/'))
+    cmd = cmd.mid(1);   // strip leading slash
+
+  SilcAccount *account = static_cast<SilcAccount *>(this->account());
+  account->sendSilcCommand(cmd);
+
+  // append message locally ...
+  session->appendMessage(msg);
+  session->messageSucceeded();
 }
 
 Kopete::ChatSession *
@@ -93,6 +106,12 @@
   _chatSession = account()->chatSession(myself);
   _chatSession->setDisplayName(nickName());
 
+  // connect the neccessary signals ...
+  QObject::connect(manager(), SIGNAL(messageSent(Kopete::Message &, 
+						 Kopete::ChatSession *)),
+		   this, SLOT(slotSendMessage(Kopete::Message &,
+					      Kopete::ChatSession *)));
+
   QObject::connect(manager(), SIGNAL(closing(Kopete::ChatSession *)), 
                    this, SLOT(slotCloseSession()));