From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 29 Nov 2006 19:55:01 +0000 (+0000)
Subject: 	Porting to new Toolkit API.
X-Git-Tag: 1.2.beta1~597
X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=commitdiff_plain;h=52cdaee97aed10da850d876340f3db1231660099

	Porting to new Toolkit API.
---

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 77b362f6..fb95eb46 100644
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -2314,7 +2314,8 @@ silc_verify_public_key_internal(SilcClient client, SilcClientConnection conn,
   memset(file, 0, sizeof(file));
 
   /* Get remote host information */
-  silc_socket_stream_get_info(conn->stream, NULL, &hostname, &ip, &port);
+  silc_socket_stream_get_info(silc_packet_stream_get_stream(conn->stream), 
+			      NULL, &hostname, &ip, &port);
 
   if (conn_type == SILC_CONN_SERVER ||
       conn_type == SILC_CONN_ROUTER) {
@@ -2592,6 +2593,8 @@ void silc_get_auth_method(SilcClient client, SilcClientConnection conn,
   silc_client_request_authentication_method(client, conn,
 					    silc_get_auth_method_callback,
 					    internal);
+#else
+  completion(TRUE, SILC_AUTH_NONE, NULL, 0, context);
 #endif
 }
 
diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index 1bd71951..14f251ab 100644
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -1229,7 +1229,7 @@ void silc_channels_init(void)
   //  command_bind_silc("key", MODULE_NAME, (SIGNAL_FUNC) command_key);
   //  command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
 
-  command_set_options("listkeys", "clients servers");
+  //command_set_options("listkeys", "clients servers");
   command_set_options("action", "sign channel");
   command_set_options("notice", "sign channel");
 
diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c
index 359d5b20..a013174f 100644
--- a/apps/irssi/src/silc/core/silc-servers.c
+++ b/apps/irssi/src/silc/core/silc-servers.c
@@ -288,7 +288,7 @@ static void silc_connect_cb(SilcClient client,
   SILC_SERVER_REC *server = context;
   char *file;
 
-  if (!server->disconnected) {
+  if (server->disconnected) {
     silc_client_close_connection(client, conn);
     return;
   }
@@ -298,9 +298,11 @@ static void silc_connect_cb(SilcClient client,
     /* We have successfully connected to server */
 
     /* Enable queueing until we have our requested nick */
+#if 0
     if (settings_get_str("nick") &&
 	!strcmp(conn->local_entry->nickname, conn->local_entry->username))
       silc_queue_enable(conn);
+#endif
 
     /* Put default attributes */
     silc_query_attributes_default(silc_client, conn);
@@ -392,7 +394,7 @@ static void sig_connected_stream_created(SilcSocketStreamStatus status,
     return;
   }
 
-  if (!server->disconnected) {
+  if (server->disconnected) {
     silc_stream_destroy(stream);
     return;
   }