- added new setting (look_one_server_buffer): use same buffer for all servers

- fixed DCC bug when looking for ports in range

4 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/plugins-config.c b/src/plugins/plugins-config.c
index 96188e2c8..830719db0 100644
--- a/src/plugins/plugins-config.c
+++ b/src/plugins/plugins-config.c
@@ -210,7 +210,7 @@ plugin_config_read ()
                 pos = strchr (line, '=');
                 if (pos == NULL)
                 {
-                    irc_display_prefix (NULL, PREFIX_ERROR);
+                    irc_display_prefix (NULL, NULL, PREFIX_ERROR);
                     gui_printf (NULL,
                                 _("%s %s, line %d: invalid syntax, missing \"=\"\n"),
                                 WEECHAT_WARNING, filename, line_number);
@@ -261,7 +261,7 @@ plugin_config_write ()
     
     if ((file = fopen (filename, "wt")) == NULL)
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s cannot create file \"%s\"\n"),
                     WEECHAT_ERROR, filename);
         free (filename);
diff --git a/src/plugins/plugins-interface.c b/src/plugins/plugins-interface.c
index e02a388b7..66728d611 100644
--- a/src/plugins/plugins-interface.c
+++ b/src/plugins/plugins-interface.c
@@ -169,7 +169,7 @@ weechat_plugin_printf (t_weechat_plugin *plugin,
     va_start (argptr, message);
     vsnprintf (buf, sizeof (buf) - 1, message, argptr);
     va_end (argptr);
-    irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
+    irc_display_prefix (NULL, ptr_buffer, PREFIX_PLUGIN);
     gui_printf (ptr_buffer, "%s\n", buf);
 }
 
@@ -189,7 +189,7 @@ weechat_plugin_printf_server (t_weechat_plugin *plugin, char *message, ...)
     va_start (argptr, message);
     vsnprintf (buf, sizeof (buf) - 1, message, argptr);
     va_end (argptr);
-    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
     gui_printf (NULL, "%s\n", buf);
 }
 
diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index 74e9d4725..a7aab152a 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -226,7 +226,7 @@ plugin_msg_handler_add (t_weechat_plugin *plugin, char *irc_command,
     }
     else
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s plugin %s: unable to add handler for IRC command \"%s\" (not enough memory)\n"),
                     WEECHAT_ERROR, plugin->name, irc_command);
@@ -261,7 +261,7 @@ plugin_cmd_handler_add (t_weechat_plugin *plugin, char *command,
     
     if (plugin_cmd_handler_search (command))
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s plugin %s: unable to add handler for \"%s\" command "
                       "(already exists)\n"),
@@ -298,7 +298,7 @@ plugin_cmd_handler_add (t_weechat_plugin *plugin, char *command,
     }
     else
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s plugin %s: unable to add handler for \"%s\" command (not enough memory)\n"),
                     WEECHAT_ERROR, plugin->name, command);
@@ -546,7 +546,7 @@ plugin_load (char *filename)
     handle = dlopen (full_name, RTLD_GLOBAL | RTLD_NOW);
     if (!handle)
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s unable to load plugin \"%s\": %s\n"),
                     WEECHAT_ERROR, full_name, dlerror());
         free (full_name);
@@ -557,7 +557,7 @@ plugin_load (char *filename)
     if (!name)
     {
         dlclose (handle);
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s symbol \"plugin_name\" not found in plugin \"%s\", failed to load\n"),
                     WEECHAT_ERROR, full_name);
         free (full_name);
@@ -567,7 +567,7 @@ plugin_load (char *filename)
     if (plugin_search (name))
     {
         dlclose (handle);
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s unable to load plugin \"%s\": a plugin with "
                       "same name already exists\n"),
@@ -580,7 +580,7 @@ plugin_load (char *filename)
     if (!description)
     {
         dlclose (handle);
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s symbol \"plugin_description\" not found in plugin \"%s\", failed to load\n"),
                     WEECHAT_ERROR, full_name);
         free (full_name);
@@ -591,7 +591,7 @@ plugin_load (char *filename)
     if (!version)
     {
         dlclose (handle);
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s symbol \"plugin_version\" not found in plugin \"%s\", failed to load\n"),
                     WEECHAT_ERROR, full_name);
         free (full_name);
@@ -602,7 +602,7 @@ plugin_load (char *filename)
     if (!init_func)
     {
         dlclose (handle);
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL, _("%s function \"weechat_plugin_init\" not found in plugin \"%s\", failed to load\n"),
                     WEECHAT_ERROR, full_name);
         free (full_name);
@@ -655,7 +655,7 @@ plugin_load (char *filename)
             weechat_plugins = new_plugin;
         last_weechat_plugin = new_plugin;
         
-        irc_display_prefix (NULL, PREFIX_PLUGIN);
+        irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
         gui_printf (NULL,
                     _("Initializing plugin \"%s\" %s\n"),
                     new_plugin->name, new_plugin->version);
@@ -663,7 +663,7 @@ plugin_load (char *filename)
         /* init plugin */
         if (((t_weechat_init_func *)init_func) (new_plugin) < 0)
         {
-            irc_display_prefix (NULL, PREFIX_ERROR);
+            irc_display_prefix (NULL, NULL, PREFIX_ERROR);
             gui_printf (NULL,
                         _("%s unable to initialize plugin \"%s\"\n"),
                         WEECHAT_ERROR, full_name);
@@ -674,7 +674,7 @@ plugin_load (char *filename)
     }
     else
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s unable to load plugin \"%s\" (not enough memory)\n"),
                     WEECHAT_ERROR, full_name);
@@ -682,7 +682,7 @@ plugin_load (char *filename)
         return NULL;
     }
     
-    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
     gui_printf (NULL,
                 _("Plugin \"%s\" (%s) loaded.\n"),
                 name, full_name);
@@ -823,12 +823,12 @@ plugin_unload_name (char *name)
     if (ptr_plugin)
     {
         plugin_unload (ptr_plugin);
-        irc_display_prefix (NULL, PREFIX_PLUGIN);
+        irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
         gui_printf (NULL, _("Plugin \"%s\" unloaded.\n"), name);
     }
     else
     {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s plugin \"%s\" not found\n"),
                     WEECHAT_ERROR, name);
diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h
index 648ab0012..36d24f81a 100644
--- a/src/plugins/weechat-plugin.h
+++ b/src/plugins/weechat-plugin.h
@@ -62,7 +62,7 @@ typedef struct t_weechat_plugin t_weechat_plugin;
 
 typedef int (t_plugin_handler_func) (t_weechat_plugin *, char *, char *, char *, char *, void *);
 
-/* message handler, called when an IRC messages is received */
+/* handlers */
 
 typedef enum t_handler_type t_handler_type;