'#' isn't needed as channel prefix anymore

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index 886e5e63fbb74d03761975a29ef3f852582e35a5..e718e61a4d491b3dab91e219cf7de1802cb911e5 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -1250,11 +1250,9 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
     printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT, argv[2]);
     internal->responder = TRUE;
-    silc_client_send_key_agreement(
-                          silc_client, conn, client_entry, hostname, 
-                          bindhost, port, 
-                          settings_get_int("key_exchange_timeout_secs"), 
-                          keyagr_completion, internal);
+    silc_client_send_key_agreement(silc_client, conn, client_entry, hostname, 
+                                  bindhost, port, 120, keyagr_completion, 
+                                  internal);
     if (!hostname)
       silc_free(internal);
     goto out;

diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c
index 86e3082b1dbc3be880a78c4101e7c49770e08361..1569b4d14bad45f4b6d123de6c241a39ed161513 100644 (file)
--- a/apps/irssi/src/silc/core/silc-servers.c
+++ b/apps/irssi/src/silc/core/silc-servers.c
@@ -166,7 +166,7 @@ static int isnickflag_func(char flag)
 
 static int ischannel_func(SERVER_REC *server, const char *data)
 {
-  return *data == '#';
+  return FALSE;
 }
 
 const char *get_nick_flags(void)
@@ -174,13 +174,14 @@ const char *get_nick_flags(void)
   return "@\0\0";
 }
 
-static void send_message(SILC_SERVER_REC *server, char *target, char *msg)
+static void send_message(SILC_SERVER_REC *server, char *target,
+                        char *msg, int target_type)
 {
   g_return_if_fail(server != NULL);
   g_return_if_fail(target != NULL);
   g_return_if_fail(msg != NULL);
 
-  if (*target == '#')
+  if (target_type == SEND_TARGET_CHANNEL)
     silc_send_channel(server, target, msg);
   else
     silc_send_msg(server, target, msg);
@@ -398,23 +399,6 @@ static void command_sconnect(const char *data, SILC_SERVER_REC *server)
   signal_stop();
 }
 
-static void event_text(const char *line, SILC_SERVER_REC *server,
-                      WI_ITEM_REC *item)
-{
-  char *str;
-
-  g_return_if_fail(line != NULL);
-
-  if (!IS_SILC_ITEM(item))
-    return;
-
-  str = g_strdup_printf("%s %s", item->name, line);
-  signal_emit("command msg", 3, str, server, item);
-  g_free(str);
-
- signal_stop();
-}
-
 /* FILE command */
 
 SILC_TASK_CALLBACK(silc_client_file_close_later)
@@ -861,7 +845,6 @@ void silc_server_init(void)
 
   signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
   signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected);
-  signal_add("send text", (SIGNAL_FUNC) event_text);
   command_bind("whois", MODULE_NAME, (SIGNAL_FUNC) command_self);
   command_bind("whowas", MODULE_NAME, (SIGNAL_FUNC) command_self);
   command_bind("nick", MODULE_NAME, (SIGNAL_FUNC) command_self);
@@ -895,7 +878,6 @@ void silc_server_deinit(void)
 
   signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
   signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
-  signal_remove("send text", (SIGNAL_FUNC) event_text);
   command_unbind("whois", (SIGNAL_FUNC) command_self);
   command_unbind("whowas", (SIGNAL_FUNC) command_self);
   command_unbind("nick", (SIGNAL_FUNC) command_self);