pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 13:05:41 +02:00
Code Activity

Move /away command from irc plugin to core

Browse Source
This commit is contained in:
Sebastien Helleu
2010-03-19 19:28:19 +01:00
parent 568d913c58
commit bc3fa9fd4c
23 changed files with 323 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-buffer.c
+1 -1
View File
@@ -116,7 +116,7 @@ irc_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
{
struct t_irc_channel *next_channel;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc-buffer.h
+18
View File
@@ -20,6 +20,24 @@
#ifndef __WEECHAT_IRC_BUFFER_H
#define __WEECHAT_IRC_BUFFER_H 1
#define IRC_BUFFER_GET_SERVER(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
irc_buffer_get_server_channel (__buffer, &ptr_server, NULL);
#define IRC_BUFFER_GET_SERVER_CHANNEL(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
struct t_irc_channel *ptr_channel = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
{ \
irc_buffer_get_server_channel (__buffer, &ptr_server, \
&ptr_channel); \
}
#define IRC_BUFFER_RAW_NAME "irc_raw"
#define IRC_BUFFER_RAW_PREFIX_RECV "-->"
#define IRC_BUFFER_RAW_PREFIX_RECV_MOD "==>"
src/plugins/irc/irc-command.c
+100 -79
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-completion.c
+9 -9
View File
@@ -44,7 +44,7 @@ irc_completion_server_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -69,7 +69,7 @@ irc_completion_server_nick_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -96,7 +96,7 @@ irc_completion_server_channels_cb (void *data, const char *completion_item,
{
struct t_irc_channel *ptr_channel;
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -131,7 +131,7 @@ irc_completion_server_privates_cb (void *data, const char *completion_item,
{
struct t_irc_channel *ptr_channel;
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -167,7 +167,7 @@ irc_completion_server_nicks_cb (void *data, const char *completion_item,
struct t_irc_channel *ptr_channel2;
struct t_irc_nick *ptr_nick;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -232,7 +232,7 @@ irc_completion_channel_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -289,7 +289,7 @@ irc_completion_channel_nicks_cb (void *data, const char *completion_item,
{
struct t_irc_nick *ptr_nick;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -357,7 +357,7 @@ irc_completion_channel_nicks_hosts_cb (void *data, const char *completion_item,
char *buf;
int length;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -417,7 +417,7 @@ irc_completion_channel_topic_cb (void *data, const char *completion_item,
{
char *topic_color;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc-input.c
+3 -3
View File
@@ -47,7 +47,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text)
text_decoded = irc_color_decode (text,
weechat_config_boolean (irc_config_network_colors_send));
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
if (ptr_channel)
{
@@ -82,7 +82,7 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, char *text)
int max_length;
char *pos, *pos_max, *last_space, *pos_next, *next, saved_char;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_channel || !text || !text[0])
return;
@@ -147,7 +147,7 @@ irc_input_data_cb (void *data, struct t_gui_buffer *buffer,
const char *ptr_data;
char *data_with_colors, *msg;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc.h
-18
View File
@@ -23,24 +23,6 @@
#define weechat_plugin weechat_irc_plugin
#define IRC_PLUGIN_NAME "irc"
#define IRC_GET_SERVER(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
irc_buffer_get_server_channel (__buffer, &ptr_server, NULL);
#define IRC_GET_SERVER_CHANNEL(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
struct t_irc_channel *ptr_channel = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
{ \
irc_buffer_get_server_channel (__buffer, &ptr_server, \
&ptr_channel); \
}
#define IRC_COLOR_CHAT weechat_color("chat")
#define IRC_COLOR_CHAT_CHANNEL weechat_color("chat_channel")
#define IRC_COLOR_CHAT_DELIMITERS weechat_color("chat_delimiters")