Do not use silc_client_send_private_message_key anymore when

	setting the private message key with /KEY.

diff --git a/TODO b/TODO
index d1af4714fa878a2d2c6e80a4bc5b6a742a1f997a..3adaf9619113d224956cc80968a81238f339ec23 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,12 +11,6 @@ TODO/bugs in Irssi SILC client
 TODO/bugs In SILC Client Library
 ================================
 
- o The PRIVATE_MESSAGE_KEY packet is not handled (it is implemented 
-   though).  This should be added and perhaps new client operation
-   should be added to notify application that it was received and
-   set the key only if application wishes to set (accept the key) it
-   (Do this to 0.9.x).
-
  o Testing
 
 

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index f2ed992655fc3a5b352fe943c0fb08b6866807d5..8c03fcdbab705a08d08e77dbb19c7ae3b30c6524 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -646,8 +646,11 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
        /* Send the key to the remote client so that it starts using it
           too. */
+       /* XXX for now we don't do this.  This feature is pretty stupid
+          and should perhaps be removed altogether from SILC.
        silc_client_send_private_message_key(silc_client, conn, 
                                             client_entry, TRUE);
+       */
       } else if (type == 2) {
        /* Set private channel key */
        char *cipher = NULL, *hmac = NULL;