summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/irc/irc-send.c34
-rw-r--r--weechat/ChangeLog2
-rw-r--r--weechat/src/irc/irc-send.c34
4 files changed, 10 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b37e9690..25ba8fe19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ ChangeLog - 2005-07-31
Version 0.1.5 (under dev!):
- * fixed refrech bug when changing channel modes
+ * fixed refresh bug when changing channel modes
* jump to next server now saves current channel buffer for each server
* ctrl-up/ctrl-down keys added to call previous/next command in global
history (common to all buffers)
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index 1e420a958..fa1a1bb92 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -678,37 +678,11 @@ irc_cmd_send_ison (t_irc_server *server, char *arguments)
int
irc_cmd_send_join (t_irc_server *server, char *arguments)
{
- char *p, *buffer;
-
- buffer = (char *) malloc( (strlen(arguments) + 1) * sizeof (*buffer));
- if (!buffer)
+ if (string_is_channel (arguments))
+ server_sendf (server, "JOIN %s\r\n", arguments);
+ else
+ server_sendf (server, "JOIN #%s\r\n", arguments);
return 0;
-
- while(arguments != NULL)
- {
- p = strchr(arguments, ',');
- if (!p)
- {
- strcpy(buffer, arguments);
- }
- else
- {
- memcpy(buffer, arguments, p - arguments);
- buffer[p - arguments] = '\0';
- arguments = ++p;
- }
-
- if (string_is_channel (buffer))
- server_sendf (server, "JOIN %s\r\n", buffer);
- else
- server_sendf (server, "JOIN #%s\r\n", buffer);
-
- if (!p) break;
- }
-
- free (buffer);
-
- return 0;
}
/*
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 7b37e9690..25ba8fe19 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,7 +5,7 @@ ChangeLog - 2005-07-31
Version 0.1.5 (under dev!):
- * fixed refrech bug when changing channel modes
+ * fixed refresh bug when changing channel modes
* jump to next server now saves current channel buffer for each server
* ctrl-up/ctrl-down keys added to call previous/next command in global
history (common to all buffers)
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index 1e420a958..fa1a1bb92 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -678,37 +678,11 @@ irc_cmd_send_ison (t_irc_server *server, char *arguments)
int
irc_cmd_send_join (t_irc_server *server, char *arguments)
{
- char *p, *buffer;
-
- buffer = (char *) malloc( (strlen(arguments) + 1) * sizeof (*buffer));
- if (!buffer)
+ if (string_is_channel (arguments))
+ server_sendf (server, "JOIN %s\r\n", arguments);
+ else
+ server_sendf (server, "JOIN #%s\r\n", arguments);
return 0;
-
- while(arguments != NULL)
- {
- p = strchr(arguments, ',');
- if (!p)
- {
- strcpy(buffer, arguments);
- }
- else
- {
- memcpy(buffer, arguments, p - arguments);
- buffer[p - arguments] = '\0';
- arguments = ++p;
- }
-
- if (string_is_channel (buffer))
- server_sendf (server, "JOIN %s\r\n", buffer);
- else
- server_sendf (server, "JOIN #%s\r\n", buffer);
-
- if (!p) break;
- }
-
- free (buffer);
-
- return 0;
}
/*