Removed old functions for removing handlers, replaced by one function, the same for all handlers

8 files changed, 78 insertions, 398 deletions

diff --git a/doc/weechat_doc_en.texi b/doc/weechat_doc_en.texi
index 79da89efa..594616f17 100644
--- a/doc/weechat_doc_en.texi
+++ b/doc/weechat_doc_en.texi
@@ -1780,7 +1780,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1812,47 +1812,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1894,15 +1854,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Remove a command handler.@*
+Remove a handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1911,13 +1871,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1930,7 +1890,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/doc/weechat_doc_es.texi b/doc/weechat_doc_es.texi
index 88ef1414e..2f320bb59 100644
--- a/doc/weechat_doc_es.texi
+++ b/doc/weechat_doc_es.texi
@@ -1783,7 +1783,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1815,47 +1815,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1897,15 +1857,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Remove a command handler.@*
+Remove a handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1914,13 +1874,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1933,7 +1893,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/doc/weechat_doc_fr.texi b/doc/weechat_doc_fr.texi
index 15e555442..7fbab4fd9 100644
--- a/doc/weechat_doc_fr.texi
+++ b/doc/weechat_doc_fr.texi
@@ -1793,7 +1793,7 @@ Aucune.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1829,47 +1829,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Supprime un gestionnaire de messages IRC.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: un pointeur vers la structure de l'extension
-@item @option{msg_handler}: le gestionnaire de messages @`a supprimer
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-Aucune.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Supprime tous les gestionnaires de messages IRC d'une extension.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: un pointeur vers la structure de l'extension
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-Aucune.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1914,15 +1874,15 @@ fichier: %s", (arguments) ? arguments : "aucun");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Supprime un gestionnaire de commande.@*
+Supprime un gestionnaire.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{plugin}: un pointeur vers la structure de l'extension
-@item @option{cmd_handler}: le gestionnaire de commande @`a supprimer
+@item @option{handler}: le gestionnaire @`a supprimer
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -1931,13 +1891,13 @@ Aucune.@*
 @*
 @emph{Exemple :}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Supprime tous les gestionnaires de commande d'une extension.@*
+Supprime tous les gestionnaires d'une extension.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -1950,7 +1910,7 @@ Aucune.@*
 @*
 @emph{Exemple :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/doc/weechat_doc_pt.texi b/doc/weechat_doc_pt.texi
index 024aa7cf4..17f83f0ed 100644
--- a/doc/weechat_doc_pt.texi
+++ b/doc/weechat_doc_pt.texi
@@ -1778,7 +1778,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1810,47 +1810,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1892,15 +1852,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
 Remove a command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1909,13 +1869,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1928,7 +1888,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/weechat/doc/weechat_doc_en.texi b/weechat/doc/weechat_doc_en.texi
index 79da89efa..594616f17 100644
--- a/weechat/doc/weechat_doc_en.texi
+++ b/weechat/doc/weechat_doc_en.texi
@@ -1780,7 +1780,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1812,47 +1812,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1894,15 +1854,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Remove a command handler.@*
+Remove a handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1911,13 +1871,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1930,7 +1890,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/weechat/doc/weechat_doc_es.texi b/weechat/doc/weechat_doc_es.texi
index 88ef1414e..2f320bb59 100644
--- a/weechat/doc/weechat_doc_es.texi
+++ b/weechat/doc/weechat_doc_es.texi
@@ -1783,7 +1783,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1815,47 +1815,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1897,15 +1857,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Remove a command handler.@*
+Remove a handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1914,13 +1874,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1933,7 +1893,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/weechat/doc/weechat_doc_fr.texi b/weechat/doc/weechat_doc_fr.texi
index 15e555442..7fbab4fd9 100644
--- a/weechat/doc/weechat_doc_fr.texi
+++ b/weechat/doc/weechat_doc_fr.texi
@@ -1793,7 +1793,7 @@ Aucune.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1829,47 +1829,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Supprime un gestionnaire de messages IRC.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: un pointeur vers la structure de l'extension
-@item @option{msg_handler}: le gestionnaire de messages @`a supprimer
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-Aucune.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Supprime tous les gestionnaires de messages IRC d'une extension.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: un pointeur vers la structure de l'extension
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-Aucune.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1914,15 +1874,15 @@ fichier: %s", (arguments) ? arguments : "aucun");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
-Supprime un gestionnaire de commande.@*
+Supprime un gestionnaire.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{plugin}: un pointeur vers la structure de l'extension
-@item @option{cmd_handler}: le gestionnaire de commande @`a supprimer
+@item @option{handler}: le gestionnaire @`a supprimer
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -1931,13 +1891,13 @@ Aucune.@*
 @*
 @emph{Exemple :}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Supprime tous les gestionnaires de commande d'une extension.@*
+Supprime tous les gestionnaires d'une extension.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -1950,7 +1910,7 @@ Aucune.@*
 @*
 @emph{Exemple :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item
diff --git a/weechat/doc/weechat_doc_pt.texi b/weechat/doc/weechat_doc_pt.texi
index 024aa7cf4..17f83f0ed 100644
--- a/weechat/doc/weechat_doc_pt.texi
+++ b/weechat/doc/weechat_doc_pt.texi
@@ -1778,7 +1778,7 @@ None.@*
 @*
 
 @item
-@command{t_plugin_msg_handler *msg_handler_add (t_weechat_plugin
+@command{t_plugin_handler *msg_handler_add (t_weechat_plugin
 *plugin, char *message, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
 @*
@@ -1810,47 +1810,7 @@ void *handler_pointer)}@*
 @*
 
 @item
-@command{void msg_handler_remove (t_weechat_plugin *plugin,
-t_plugin_msg_handler *msg_handler)}@*
-@*
-Remove an IRC message handler.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@item @option{msg_handler}: handler to remove
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove (plugin, my_msg_handler);}@*
-@*
-
-@item
-@command{void msg_handler_remove_all (t_weechat_plugin *plugin)}@*
-@*
-Remove all IRC message handlers for a plugin.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{plugin}: pointer to plugin structure
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-None.@*
-@*
-@emph{Example:}@*
-@*
-@code{plugin->msg_handler_remove_all (plugin);}@*
-@*
-
-@item
-@command{t_plugin_cmd_handler *cmd_handler_add (t_weechat_plugin
+@command{t_plugin_handler *cmd_handler_add (t_weechat_plugin
 *plugin, char *command, char *description, char *arguments,
 char *arguments_description, t_plugin_handler_func *handler_func,
 char *handler_args, void *handler_pointer)}@*
@@ -1892,15 +1852,15 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 
 @item
-@command{void cmd_handler_remove (t_weechat_plugin *plugin,
-t_plugin_cmd_handler *cmd_handler)}@*
+@command{void handler_remove (t_weechat_plugin *plugin,
+t_plugin_handler *handler)}@*
 @*
 Remove a command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{plugin}: pointer to plugin structure
-@item @option{cmd_handler}: command handler to remove
+@item @option{handler}: handler to remove
 @end itemize
 @*
 @emph{Return value:}@*
@@ -1909,13 +1869,13 @@ None.@*
 @*
 @emph{Example:}@*
 @*
-@code{plugin->cmd_handler_remove (plugin, my_cmd_handler);}@*
+@code{plugin->handler_remove (plugin, my_handler);}@*
 @*
 
 @item
-@command{void cmd_handler_remove_all (t_weechat_plugin *plugin)}@*
+@command{void handler_remove_all (t_weechat_plugin *plugin)}@*
 @*
-Remove all command handlers for a plugin.@*
+Remove all handlers for a plugin.@*
 
 @emph{Arguments:}
 @itemize @minus
@@ -1928,7 +1888,7 @@ None.@*
 @*
 @emph{Example :}@*
 @*
-@code{plugin->cmd_handler_remove_all (plugin);}@*
+@code{plugin->handler_remove_all (plugin);}@*
 @*
 
 @item