Print{,_attr} and server{,_attr} hooks were incorrectly handled when both

version existed (regular and attrs).  Specifically, the priority was not
respected, and both versions were run even when EAT_PLUGIN was returned.

Fixes #847.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/common/plugin.h b/src/common/plugin.h
index ee9da8c1..cd3f70a8 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -170,11 +170,9 @@ int plugin_kill (char *name, int by_filename);
 void plugin_kill_all (void);
 void plugin_auto_load (session *sess);
 int plugin_emit_command (session *sess, char *name, char *word[], char *word_eol[]);
-int plugin_emit_server (session *sess, char *name, char *word[], char *word_eol[]);
-int plugin_emit_server_attrs (session *sess, char *name, char *word[],
-							  char *word_eol[], time_t server_time);
-int plugin_emit_print (session *sess, char *word[]);
-int plugin_emit_print_attrs (session *sess, char *word[], time_t server_time);
+int plugin_emit_server (session *sess, char *name, char *word[], char *word_eol[],
+						time_t server_time);
+int plugin_emit_print (session *sess, char *word[], time_t server_time);
 int plugin_emit_dummy_print (session *sess, char *name);
 int plugin_emit_keypress (session *sess, unsigned int state, unsigned int keyval, int len, char *string);
 GList* plugin_command_list(GList *tmp_list);