[Pkg-silc-commits] r256 - in /kopete-silc-plugin/branches/etch-backports: ./ debian/ src/

lunar at users.alioth.debian.org lunar at users.alioth.debian.org
Wed Apr 2 12:40:07 UTC 2008


Author: lunar
Date: Wed Apr  2 12:40:07 2008
New Revision: 256

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=256
Log:
Update to prepare to 0.4-1~bpo40+1

Modified:
    kopete-silc-plugin/branches/etch-backports/README
    kopete-silc-plugin/branches/etch-backports/debian/changelog
    kopete-silc-plugin/branches/etch-backports/debian/control
    kopete-silc-plugin/branches/etch-backports/debian/dirs
    kopete-silc-plugin/branches/etch-backports/debian/rules
    kopete-silc-plugin/branches/etch-backports/src/silcaccount.cpp
    kopete-silc-plugin/branches/etch-backports/src/silcbuddycontact.cpp
    kopete-silc-plugin/branches/etch-backports/src/silcchannelcontact.cpp
    kopete-silc-plugin/branches/etch-backports/src/silccontact.cpp
    kopete-silc-plugin/branches/etch-backports/src/silcfiletransfer.cpp
    kopete-silc-plugin/branches/etch-backports/src/silcmessagemanager.cpp
    kopete-silc-plugin/branches/etch-backports/src/silcservercontact.cpp

Modified: kopete-silc-plugin/branches/etch-backports/README
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/README?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/README (original)
+++ kopete-silc-plugin/branches/etch-backports/README Wed Apr  2 12:40:07 2008
@@ -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/branches/etch-backports/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/debian/changelog?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/debian/changelog (original)
+++ kopete-silc-plugin/branches/etch-backports/debian/changelog Wed Apr  2 12:40:07 2008
@@ -1,8 +1,24 @@
-kopete-silc-plugin (0.3-3~bpo40+1) etch-backports; urgency=low
+kopete-silc-plugin (0.4-1~bpo40+1) UNRELEASED; urgency=low
 
   * Rebuilt for etch.
 
- -- Jérémy Bobbio <lunar at debian.org>  Wed, 29 Aug 2007 18:16:42 +0200
+ -- Jérémy Bobbio <lunar at debian.org>  Wed, 02 Apr 2008 14:38:43 +0200
+
+kopete-silc-plugin (0.4-1) unstable; urgency=low
+
+  [ Stefan Siegl ]
+  * New upstream release.
+
+  [ Jérémy Bobbio ]
+  * Add a watch file.
+  * Bump Standards-Version (no changes required).
+  * Promote Homepage as a regular field.
+  * Stop shipping empty upstream ChangeLog.
+  * Do not ship empty /usr/bin and /usr/sbin.
+  * Fix FTBFS with GCC 4.3.  (Closes: #454853)
+    Thanks Cyril Brulebois for the patch!
+
+ -- Jérémy Bobbio <lunar at debian.org>  Tue, 11 Mar 2008 01:34:53 +0100
 
 kopete-silc-plugin (0.3-3) unstable; urgency=low
 

Modified: kopete-silc-plugin/branches/etch-backports/debian/control
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/debian/control?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/debian/control (original)
+++ kopete-silc-plugin/branches/etch-backports/debian/control Wed Apr  2 12:40:07 2008
@@ -5,7 +5,8 @@
 Uploaders: Stefan Siegl <stesie at brokenpipe.de>,
  Jérémy Bobbio <lunar at debian.org>
 Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdenetwork-dev, libsilc-1.1-2-dev, cmake
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.brokenpipe.de/SILC/index.html
 XS-Vcs-Svn: svn://svn.debian.org/pkg-silc/kopete-silc-plugin/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk
 
@@ -24,4 +25,3 @@
  secure and IRC is not in any way.  The network model is also entirely
  different to IRC.
  .
-  Homepage: http://www.brokenpipe.de/SILC/index.html

Modified: kopete-silc-plugin/branches/etch-backports/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/debian/dirs?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/debian/dirs (original)
+++ kopete-silc-plugin/branches/etch-backports/debian/dirs Wed Apr  2 12:40:07 2008
@@ -1,2 +1,0 @@
-usr/bin
-usr/sbin

Modified: kopete-silc-plugin/branches/etch-backports/debian/rules
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/debian/rules?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/debian/rules (original)
+++ kopete-silc-plugin/branches/etch-backports/debian/rules Wed Apr  2 12:40:07 2008
@@ -57,7 +57,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs
 	dh_installman
 	dh_link

Modified: kopete-silc-plugin/branches/etch-backports/src/silcaccount.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcaccount.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcaccount.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcaccount.cpp Wed Apr  2 12:40:07 2008
@@ -18,6 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <cstdlib>
 #include <iostream>
 #include <assert.h>
 
@@ -875,8 +876,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 +944,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 +989,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/branches/etch-backports/src/silcbuddycontact.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcbuddycontact.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcbuddycontact.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcbuddycontact.cpp Wed Apr  2 12:40:07 2008
@@ -20,6 +20,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <cstdlib>
 #include <iostream>
 #include <assert.h>
 

Modified: kopete-silc-plugin/branches/etch-backports/src/silcchannelcontact.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcchannelcontact.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcchannelcontact.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcchannelcontact.cpp Wed Apr  2 12:40:07 2008
@@ -18,6 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <sys/types.h>
 #include <iostream>
 #include <assert.h>
 

Modified: kopete-silc-plugin/branches/etch-backports/src/silccontact.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silccontact.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silccontact.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silccontact.cpp Wed Apr  2 12:40:07 2008
@@ -19,6 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <iostream>
+#include <stdlib.h>
 
 #include "silcaccount.h"
 #include "silccontact.h"

Modified: kopete-silc-plugin/branches/etch-backports/src/silcfiletransfer.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcfiletransfer.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcfiletransfer.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcfiletransfer.cpp Wed Apr  2 12:40:07 2008
@@ -19,6 +19,8 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <iostream>
+#include <cstring>
+#include <sys/types.h>
 
 #include "silcfiletransfer.h"
 #include "silcaccount.h"

Modified: kopete-silc-plugin/branches/etch-backports/src/silcmessagemanager.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcmessagemanager.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcmessagemanager.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcmessagemanager.cpp Wed Apr  2 12:40:07 2008
@@ -17,6 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <iostream>
+#include <cstdlib>
 #include <assert.h>
 
 // for message boxes ...

Modified: kopete-silc-plugin/branches/etch-backports/src/silcservercontact.cpp
URL: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/branches/etch-backports/src/silcservercontact.cpp?rev=256&op=diff
==============================================================================
--- kopete-silc-plugin/branches/etch-backports/src/silcservercontact.cpp (original)
+++ kopete-silc-plugin/branches/etch-backports/src/silcservercontact.cpp Wed Apr  2 12:40:07 2008
@@ -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()));
 




More information about the Pkg-silc-commits mailing list