blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irc: rename server variable "nick_host" to "host"

Browse Source
This commit is contained in:
Sébastien Helleu 2019-05-12 07:45:07 +02:00
parent e1fb8433ce
commit a24817b141
13 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.adoc
View File

@ -31,7 +31,7 @@ New features::
* api: add function command_options (issue #928) * api: add function command_options (issue #928)
* api: add function string_match_list * api: add function string_match_list
* irc: add bar items "irc_nick", "irc_host" and "irc_nick_host" * irc: add bar items "irc_nick", "irc_host" and "irc_nick_host"
* irc: add variable "nick_host" in server structure * irc: add variable "host" in server structure
* relay: add option relay.weechat.commands (issue #928) * relay: add option relay.weechat.commands (issue #928)
* script: use SHA-512 instead of MD5 for script checksum * script: use SHA-512 instead of MD5 for script checksum
* spell: rename aspell plugin to spell (issue #1299) * spell: rename aspell plugin to spell (issue #1299)

2
doc/de/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

2
doc/en/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

2
doc/fr/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

2
doc/it/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

2
doc/ja/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

2
doc/pl/autogen/plugin_api/hdata.adoc
View File

@ -243,7 +243,7 @@ _nick_first_tried_   (integer) +
_nick_alternate_number_   (integer) + _nick_alternate_number_   (integer) +
_nick_   (string) + _nick_   (string) +
_nick_modes_   (string) + _nick_modes_   (string) +
_nick_host_   (string) + _host_   (string) +
_checking_cap_ls_   (integer) + _checking_cap_ls_   (integer) +
_cap_ls_   (hashtable) + _cap_ls_   (hashtable) +
_checking_cap_list_   (integer) + _checking_cap_list_   (integer) +

8
src/plugins/irc/irc-bar-item.c
View File

@ -437,10 +437,10 @@ irc_bar_item_host (const void *pointer, void *data,
return NULL; return NULL;
irc_buffer_get_server_and_channel (buffer, &server, NULL); irc_buffer_get_server_and_channel (buffer, &server, NULL);
if (!server || !server->nick_host) if (!server || !server->host)
return NULL; return NULL;
return strdup (server->nick_host); return strdup (server->host);
} }
/* /*
@ -473,8 +473,8 @@ irc_bar_item_nick_host (const void *pointer, void *data,
snprintf (buf, sizeof (buf), "%s%s%s", snprintf (buf, sizeof (buf), "%s%s%s",
server->nick, server->nick,
(server->nick_host) ? "@" : "", (server->host) ? "@" : "",
(server->nick_host) ? server->nick_host : ""); (server->host) ? server->host : "");
return strdup (buf); return strdup (buf);
} }

2
src/plugins/irc/irc-channel.c
View File

@ -328,7 +328,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
weechat_buffer_set (ptr_buffer, "localvar_set_type", weechat_buffer_set (ptr_buffer, "localvar_set_type",
(channel_type == IRC_CHANNEL_TYPE_CHANNEL) ? "channel" : "private"); (channel_type == IRC_CHANNEL_TYPE_CHANNEL) ? "channel" : "private");
weechat_buffer_set (ptr_buffer, "localvar_set_nick", server->nick); weechat_buffer_set (ptr_buffer, "localvar_set_nick", server->nick);
weechat_buffer_set (ptr_buffer, "localvar_set_nick_host", server->nick_host); weechat_buffer_set (ptr_buffer, "localvar_set_host", server->host);
weechat_buffer_set (ptr_buffer, "localvar_set_server", server->name); weechat_buffer_set (ptr_buffer, "localvar_set_server", server->name);
weechat_buffer_set (ptr_buffer, "localvar_set_channel", channel_name); weechat_buffer_set (ptr_buffer, "localvar_set_channel", channel_name);
if (server->is_away && server->away_message) if (server->is_away && server->away_message)

6
src/plugins/irc/irc-protocol.c
View File

@ -834,7 +834,7 @@ IRC_PROTOCOL_CALLBACK(chghost)
snprintf (str_host, length, "%s@%s", argv[2], pos_new_host); snprintf (str_host, length, "%s@%s", argv[2], pos_new_host);
if (local_chghost) if (local_chghost)
irc_server_set_nick_host (server, str_host); irc_server_set_host (server, str_host);
for (ptr_channel = server->channels; ptr_channel; for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel) ptr_channel = ptr_channel->next_channel)
@ -1201,7 +1201,7 @@ IRC_PROTOCOL_CALLBACK(join)
if (local_join) if (local_join)
{ {
irc_server_set_nick_host (server, address); irc_server_set_host (server, address);
irc_bar_item_update_channel (); irc_bar_item_update_channel ();
} }
@ -1524,7 +1524,7 @@ IRC_PROTOCOL_CALLBACK(nick)
if (local_nick) if (local_nick)
{ {
irc_server_set_nick (server, new_nick); irc_server_set_nick (server, new_nick);
irc_server_set_nick_host (server, address); irc_server_set_host (server, address);
} }
ptr_nick_found = NULL; ptr_nick_found = NULL;

38
src/plugins/irc/irc-server.c
View File

@ -761,33 +761,33 @@ irc_server_set_nick (struct t_irc_server *server, const char *nick)
} }
/* /*
* Sets nick host for server. * Sets host for server.
*/ */
void void
irc_server_set_nick_host (struct t_irc_server *server, const char *host) irc_server_set_host (struct t_irc_server *server, const char *host)
{ {
struct t_irc_channel *ptr_channel; struct t_irc_channel *ptr_channel;
/* if host is the same, just return */ /* if host is the same, just return */
if ((!server->nick_host && !host) if ((!server->host && !host)
|| (server->nick_host && host && strcmp (server->nick_host, host) == 0)) || (server->host && host && strcmp (server->host, host) == 0))
{ {
return; return;
} }
/* update the nick host in server */ /* update the nick host in server */
if (server->nick_host) if (server->host)
free (server->nick_host); free (server->host);
server->nick_host = (host) ? strdup (host) : NULL; server->host = (host) ? strdup (host) : NULL;
/* set local variable "nick_host" for server and all channels/pv */ /* set local variable "host" for server and all channels/pv */
weechat_buffer_set (server->buffer, "localvar_set_nick_host", host); weechat_buffer_set (server->buffer, "localvar_set_host", host);
for (ptr_channel = server->channels; ptr_channel; for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel) ptr_channel = ptr_channel->next_channel)
{ {
weechat_buffer_set (ptr_channel->buffer, weechat_buffer_set (ptr_channel->buffer,
"localvar_set_nick_host", host); "localvar_set_host", host);
} }
weechat_bar_item_update ("irc_host"); weechat_bar_item_update ("irc_host");
@ -1379,7 +1379,7 @@ irc_server_alloc (const char *name)
new_server->nick_alternate_number = -1; new_server->nick_alternate_number = -1;
new_server->nick = NULL; new_server->nick = NULL;
new_server->nick_modes = NULL; new_server->nick_modes = NULL;
new_server->nick_host = NULL; new_server->host = NULL;
new_server->checking_cap_ls = 0; new_server->checking_cap_ls = 0;
new_server->cap_ls = weechat_hashtable_new (32, new_server->cap_ls = weechat_hashtable_new (32,
WEECHAT_HASHTABLE_STRING, WEECHAT_HASHTABLE_STRING,
@ -1907,8 +1907,8 @@ irc_server_free_data (struct t_irc_server *server)
free (server->nick); free (server->nick);
if (server->nick_modes) if (server->nick_modes)
free (server->nick_modes); free (server->nick_modes);
if (server->nick_host) if (server->host)
free (server->nick_host); free (server->host);
if (server->isupport) if (server->isupport)
free (server->isupport); free (server->isupport);
if (server->prefix_modes) if (server->prefix_modes)
@ -5116,10 +5116,10 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address,
weechat_bar_item_update ("input_prompt"); weechat_bar_item_update ("input_prompt");
weechat_bar_item_update ("irc_nick_modes"); weechat_bar_item_update ("irc_nick_modes");
} }
if (server->nick_host) if (server->host)
{ {
free (server->nick_host); free (server->host);
server->nick_host = NULL; server->host = NULL;
weechat_bar_item_update ("irc_host"); weechat_bar_item_update ("irc_host");
weechat_bar_item_update ("irc_nick_host"); weechat_bar_item_update ("irc_nick_host");
} }
@ -5681,7 +5681,7 @@ irc_server_hdata_server_cb (const void *pointer, void *data,
WEECHAT_HDATA_VAR(struct t_irc_server, nick_alternate_number, INTEGER, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, nick_alternate_number, INTEGER, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, nick, STRING, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, nick, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, nick_modes, STRING, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, nick_modes, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, nick_host, STRING, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, host, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, checking_cap_ls, INTEGER, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, checking_cap_ls, INTEGER, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, cap_ls, HASHTABLE, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, cap_ls, HASHTABLE, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_irc_server, checking_cap_list, INTEGER, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, checking_cap_list, INTEGER, 0, NULL, NULL);
@ -5907,7 +5907,7 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
return 0; return 0;
if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", server->nick_modes)) if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", server->nick_modes))
return 0; return 0;
if (!weechat_infolist_new_var_string (ptr_item, "nick_host", server->nick_host)) if (!weechat_infolist_new_var_string (ptr_item, "host", server->host))
return 0; return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_ls", server->checking_cap_ls)) if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_ls", server->checking_cap_ls))
return 0; return 0;
@ -6295,7 +6295,7 @@ irc_server_print_log ()
weechat_log_printf (" nick_alternate_number: %d", ptr_server->nick_alternate_number); weechat_log_printf (" nick_alternate_number: %d", ptr_server->nick_alternate_number);
weechat_log_printf (" nick . . . . . . . . : '%s'", ptr_server->nick); weechat_log_printf (" nick . . . . . . . . : '%s'", ptr_server->nick);
weechat_log_printf (" nick_modes . . . . . : '%s'", ptr_server->nick_modes); weechat_log_printf (" nick_modes . . . . . : '%s'", ptr_server->nick_modes);
weechat_log_printf (" nick_host. . . . . . : '%s'", ptr_server->nick_host); weechat_log_printf (" host . . . . . . . . : '%s'", ptr_server->host);
weechat_log_printf (" checking_cap_ls. . . : %d", ptr_server->checking_cap_ls); weechat_log_printf (" checking_cap_ls. . . : %d", ptr_server->checking_cap_ls);
weechat_log_printf (" cap_ls . . . . . . . : 0x%lx (hashtable: '%s')", weechat_log_printf (" cap_ls . . . . . . . : 0x%lx (hashtable: '%s')",
ptr_server->cap_ls, ptr_server->cap_ls,

6
src/plugins/irc/irc-server.h
View File

@ -192,7 +192,7 @@ struct t_irc_server
/* (nick____1, nick____2, ...) */ /* (nick____1, nick____2, ...) */
char *nick; /* current nickname */ char *nick; /* current nickname */
char *nick_modes; /* nick modes */ char *nick_modes; /* nick modes */
char *nick_host; /* nick host (set if known) */ char *host; /* self host (set if known) */
int checking_cap_ls; /* 1 if checking supported capabilities */ int checking_cap_ls; /* 1 if checking supported capabilities */
struct t_hashtable *cap_ls; /* list of supported capabilities */ struct t_hashtable *cap_ls; /* list of supported capabilities */
int checking_cap_list; /* 1 if checking enabled capabilities */ int checking_cap_list; /* 1 if checking enabled capabilities */
@ -295,8 +295,8 @@ extern void irc_server_set_nicks (struct t_irc_server *server,
const char *nicks); const char *nicks);
extern void irc_server_set_nick (struct t_irc_server *server, extern void irc_server_set_nick (struct t_irc_server *server,
const char *nick); const char *nick);
extern void irc_server_set_nick_host (struct t_irc_server *server, extern void irc_server_set_host (struct t_irc_server *server,
const char *nick_host); const char *host);
extern const char *irc_server_get_alternate_nick (struct t_irc_server *server); extern const char *irc_server_get_alternate_nick (struct t_irc_server *server);
extern const char *irc_server_get_isupport_value (struct t_irc_server *server, extern const char *irc_server_get_isupport_value (struct t_irc_server *server,
const char *feature); const char *feature);

4
src/plugins/irc/irc-upgrade.c
View File

@ -420,9 +420,9 @@ irc_upgrade_read_cb (const void *pointer, void *data,
str = weechat_infolist_string (infolist, "nick_modes"); str = weechat_infolist_string (infolist, "nick_modes");
if (str) if (str)
irc_upgrade_current_server->nick_modes = strdup (str); irc_upgrade_current_server->nick_modes = strdup (str);
str = weechat_infolist_string (infolist, "nick_host"); str = weechat_infolist_string (infolist, "host");
if (str) if (str)
irc_upgrade_current_server->nick_host = strdup (str); irc_upgrade_current_server->host = strdup (str);
/* /*
* "cap_ls" and "cap_list" replace "cap_away_notify", * "cap_ls" and "cap_list" replace "cap_away_notify",
* "cap_account_notify" and "cap_extended_join" * "cap_account_notify" and "cap_extended_join"