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

api: change type of arguments displayed/highlight in hook_print callback from string to integer (in scripts)

Browse Source
This commit is contained in:
Sébastien Helleu
2014-05-10 08:26:56 +02:00
parent 6d205222aa
commit cdab55aa05
11 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/guile/weechat-guile-api.c
+3 -7
View File
@@ -2300,15 +2300,15 @@ weechat_guile_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = &displayed;
func_argv[5] = &highlight;
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_guile_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssiiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2321,10 +2321,6 @@ weechat_guile_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
free (func_argv[1]);
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
if (func_argv[5])
free (func_argv[5]);
return ret;
}
src/plugins/lua/weechat-lua-api.c
+3 -7
View File
@@ -2496,15 +2496,15 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = &displayed;
func_argv[5] = &highlight;
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_lua_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssiiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2517,10 +2517,6 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
free (func_argv[1]);
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
if (func_argv[5])
free (func_argv[5]);
return ret;
}
src/plugins/perl/weechat-perl-api.c
+3 -7
View File
@@ -2332,15 +2332,15 @@ weechat_perl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = &displayed;
func_argv[5] = &highlight;
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_perl_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssiiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2353,10 +2353,6 @@ weechat_perl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
free (func_argv[1]);
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
if (func_argv[5])
free (func_argv[5]);
return ret;
}
src/plugins/python/weechat-python-api.c
+9 -5
View File
@@ -2438,15 +2438,15 @@ weechat_python_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = PyLong_FromLong((long)displayed);
func_argv[5] = PyLong_FromLong((long)highlight);
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_python_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssOOss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2460,9 +2460,13 @@ weechat_python_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
{
Py_XDECREF((PyObject *)func_argv[4]);
}
if (func_argv[5])
free (func_argv[5]);
{
Py_XDECREF((PyObject *)func_argv[5]);
}
return ret;
}
src/plugins/ruby/weechat-ruby-api.c
+3 -7
View File
@@ -2848,15 +2848,15 @@ weechat_ruby_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = &displayed;
func_argv[5] = &highlight;
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_ruby_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssiiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2869,10 +2869,6 @@ weechat_ruby_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
free (func_argv[1]);
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
if (func_argv[5])
free (func_argv[5]);
return ret;
}
src/plugins/tcl/weechat-tcl-api.c
+3 -7
View File
@@ -2764,15 +2764,15 @@ weechat_tcl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
func_argv[3] = weechat_string_build_with_split_string (tags, ",");
if (!func_argv[3])
func_argv[3] = strdup ("");
func_argv[4] = (displayed) ? strdup ("1") : strdup ("0");
func_argv[5] = (highlight) ? strdup ("1") : strdup ("0");
func_argv[4] = &displayed;
func_argv[5] = &highlight;
func_argv[6] = (prefix) ? (char *)prefix : empty_arg;
func_argv[7] = (message) ? (char *)message : empty_arg;
rc = (int *) weechat_tcl_exec (script_callback->script,
WEECHAT_SCRIPT_EXEC_INT,
script_callback->function,
"ssssssss", func_argv);
"ssssiiss", func_argv);
if (!rc)
ret = WEECHAT_RC_ERROR;
@@ -2785,10 +2785,6 @@ weechat_tcl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
free (func_argv[1]);
if (func_argv[3])
free (func_argv[3]);
if (func_argv[4])
free (func_argv[4]);
if (func_argv[5])
free (func_argv[5]);
return ret;
}