From e7096810c43e1db561f568c2751e257a85f67aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 17 Aug 2018 07:43:56 +0200 Subject: [PATCH] trigger: rename variable "tg_tags" to "tags" in line trigger --- doc/de/weechat_user.de.adoc | 2 +- doc/en/weechat_user.en.adoc | 2 +- doc/fr/weechat_user.fr.adoc | 2 +- doc/it/weechat_user.it.adoc | 2 +- doc/ja/weechat_user.ja.adoc | 2 +- doc/pl/weechat_user.pl.adoc | 2 +- src/plugins/trigger/trigger-callback.c | 13 +++++-------- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 15ed8b2eb..b483648d4 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -3813,7 +3813,7 @@ welche abhängig von dem genutzten Hook ist: | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index d92df6c8f..f8dd81d58 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -3725,7 +3725,7 @@ type: | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index 883511987..8742d08fd 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -3844,7 +3844,7 @@ du type de hook : | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 62952150e..8418252f2 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -3986,7 +3986,7 @@ type: | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index 6521a3c60..f7418665d 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -3723,7 +3723,7 @@ _var_ | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 97ae50036..fe138f927 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -3757,7 +3757,7 @@ od typu uchwytu: | signal | tg_signal_data | | hsignal | | | modifier | tg_string | tg_string -| line | message | buffer, buffer_name, y, date, date_printed, str_time, tg_tags, notify_level, highlight, prefix, message +| line | message | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message | print | tg_message | | command | tg_argv_eol1 | | command_run | tg_command | diff --git a/src/plugins/trigger/trigger-callback.c b/src/plugins/trigger/trigger-callback.c index d77f15a7d..c69a50c69 100644 --- a/src/plugins/trigger/trigger-callback.c +++ b/src/plugins/trigger/trigger-callback.c @@ -827,7 +827,7 @@ trigger_callback_line_cb (const void *pointer, void *data, { snprintf (str_tags, length, ",%s,", (ptr_value) ? ptr_value : ""); - weechat_hashtable_set (extra_vars, "tg_tags", str_tags); + weechat_hashtable_set (extra_vars, "tags", str_tags); free (str_tags); } @@ -854,12 +854,9 @@ trigger_callback_line_cb (const void *pointer, void *data, ptr_key = weechat_list_string (ptr_item); if (weechat_hashtable_has_key (extra_vars, ptr_key)) { - if (strcmp (ptr_key, "tg_tags") == 0) + if (strcmp (ptr_key, "tags") == 0) { - /* - * remove commas at the beginning/end of tg_tags and - * rename the key to "tags" - */ + /* remove commas at the beginning/end of tags */ ptr_value = weechat_hashtable_get (extra_vars, ptr_key); if (ptr_value && ptr_value[0]) { @@ -873,13 +870,13 @@ trigger_callback_line_cb (const void *pointer, void *data, str_tags[strlen (str_tags) - 1] = '\0'; } weechat_hashtable_set (hashtable, - "tags", str_tags); + ptr_key, str_tags); free (str_tags); } } else { - weechat_hashtable_set (hashtable, "tags", ptr_value); + weechat_hashtable_set (hashtable, ptr_key, ptr_value); } } else