plugins: set priority in calls to weechat_config_new (issue #1872)

2026-07-07 02:03:13 +02:00 · 2023-01-12 07:38:01 +01:00
parent 9174ec979b
commit 202b4d82c0
75 changed files with 127 additions and 51 deletions
@@ -25,6 +25,7 @@

 #include "../weechat-plugin.h"
 #include "alias.h"
+#include "alias-config.h"


 struct t_config_file *alias_config_file = NULL;
@@ -368,7 +369,7 @@ alias_config_init ()
 {
    struct t_config_section *ptr_section;

-    alias_config_file = weechat_config_new (ALIAS_CONFIG_NAME,
+    alias_config_file = weechat_config_new (ALIAS_CONFIG_PRIO_NAME,
                                            &alias_config_reload, NULL, NULL);
    if (!alias_config_file)
        return 0;
@@ -20,6 +20,9 @@
 #ifndef WEECHAT_PLUGIN_ALIAS_CONFIG_H
 #define WEECHAT_PLUGIN_ALIAS_CONFIG_H

+#define ALIAS_CONFIG_NAME "alias"
+#define ALIAS_CONFIG_PRIO_NAME (TO_STR(ALIAS_PLUGIN_PRIORITY) "|" ALIAS_CONFIG_NAME)
+
 extern struct t_config_file *alias_config_file;
 extern struct t_config_section *alias_config_section_cmd;
 extern struct t_config_section *alias_config_section_completion;
@@ -36,7 +36,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Alias commands"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(11000);
+WEECHAT_PLUGIN_PRIORITY(ALIAS_PLUGIN_PRIORITY);

 #define ALIAS_IS_ARG_NUMBER(number) ((number >= '1') && (number <= '9'))

@@ -22,8 +22,7 @@

 #define weechat_plugin weechat_alias_plugin
 #define ALIAS_PLUGIN_NAME "alias"
-
-#define ALIAS_CONFIG_NAME "alias"
+#define ALIAS_PLUGIN_PRIORITY 11000

 struct t_alias
 {
@@ -469,7 +469,7 @@ buflist_config_init ()
    struct t_config_section *ptr_section;

    buflist_config_file = weechat_config_new (
-        BUFLIST_CONFIG_NAME,
+        BUFLIST_CONFIG_PRIO_NAME,
        &buflist_config_reload, NULL, NULL);
    if (!buflist_config_file)
        return 0;
@@ -23,6 +23,7 @@
 #include "buflist-bar-item.h"

 #define BUFLIST_CONFIG_NAME "buflist"
+#define BUFLIST_CONFIG_PRIO_NAME (TO_STR(BUFLIST_PLUGIN_PRIORITY) "|" BUFLIST_CONFIG_NAME)

 #define BUFLIST_CONFIG_SIGNALS_REFRESH                                  \
    "buffer_opened,buffer_closed,buffer_merged,buffer_unmerged,"        \
@@ -38,7 +38,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Buffers list"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(10000);
+WEECHAT_PLUGIN_PRIORITY(BUFLIST_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_buflist_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_buflist_plugin
 #define BUFLIST_PLUGIN_NAME "buflist"
+#define BUFLIST_PLUGIN_PRIORITY 10000

 #define BUFLIST_BAR_NAME "buflist"

@@ -18,7 +18,7 @@
 #

 add_library(charset MODULE
-  charset.c
+  charset.c charset.h
 )
 set_target_properties(charset PROPERTIES PREFIX "")

@@ -28,21 +28,17 @@
 #include <iconv.h>

 #include "../weechat-plugin.h"
+#include "charset.h"


-#define CHARSET_PLUGIN_NAME "charset"
-
 WEECHAT_PLUGIN_NAME(CHARSET_PLUGIN_NAME);
 WEECHAT_PLUGIN_DESCRIPTION(N_("Charset conversions"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(16000);
-
-#define CHARSET_CONFIG_NAME "charset"
+WEECHAT_PLUGIN_PRIORITY(CHARSET_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_charset_plugin = NULL;
-#define weechat_plugin weechat_charset_plugin

 struct t_config_file *charset_config_file = NULL;
 struct t_config_option *charset_default_decode = NULL;
@@ -201,8 +197,9 @@ charset_config_init ()
 {
    struct t_config_section *ptr_section;

-    charset_config_file = weechat_config_new (CHARSET_CONFIG_NAME,
-                                              &charset_config_reload, NULL, NULL);
+    charset_config_file = weechat_config_new (
+        CHARSET_CONFIG_PRIO_NAME,
+        &charset_config_reload, NULL, NULL);
    if (!charset_config_file)
        return 0;

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2003-2023 Sébastien Helleu <flashcode@flashtux.org>
+ *
+ * This file is part of WeeChat, the extensible chat client.
+ *
+ * WeeChat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * WeeChat is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef WEECHAT_PLUGIN_CHARSET_H
+#define WEECHAT_PLUGIN_CHARSET_H
+
+#define weechat_plugin weechat_charset_plugin
+#define CHARSET_PLUGIN_NAME "charset"
+#define CHARSET_PLUGIN_PRIORITY 16000
+
+#define CHARSET_CONFIG_NAME "charset"
+#define CHARSET_CONFIG_PRIO_NAME (TO_STR(CHARSET_PLUGIN_PRIORITY) "|" CHARSET_CONFIG_NAME)
+
+extern struct t_weechat_plugin *weechat_charset_plugin;
+
+#endif /* WEECHAT_PLUGIN_CHARSET_H */
@@ -100,7 +100,7 @@ exec_config_init ()
 {
    struct t_config_section *ptr_section;

-    exec_config_file = weechat_config_new (EXEC_CONFIG_NAME,
+    exec_config_file = weechat_config_new (EXEC_CONFIG_PRIO_NAME,
                                           &exec_config_reload_cb, NULL, NULL);
    if (!exec_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_EXEC_CONFIG_H

 #define EXEC_CONFIG_NAME "exec"
+#define EXEC_CONFIG_PRIO_NAME (TO_STR(EXEC_PLUGIN_PRIORITY) "|" EXEC_CONFIG_NAME)

 extern struct t_config_file *exec_config_file;

@@ -37,7 +37,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Execution of external commands in WeeChat"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(14000);
+WEECHAT_PLUGIN_PRIORITY(EXEC_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_exec_plugin = NULL;

@@ -25,6 +25,7 @@

 #define weechat_plugin weechat_exec_plugin
 #define EXEC_PLUGIN_NAME "exec"
+#define EXEC_PLUGIN_PRIORITY 14000

 #define EXEC_STDOUT 0
 #define EXEC_STDERR 1
@@ -87,7 +87,7 @@ fifo_config_init ()
 {
    struct t_config_section *ptr_section;

-    fifo_config_file = weechat_config_new (FIFO_CONFIG_NAME,
+    fifo_config_file = weechat_config_new (FIFO_CONFIG_PRIO_NAME,
                                           NULL, NULL, NULL);
    if (!fifo_config_file)
        return 0;
@@ -21,7 +21,7 @@
 #define WEECHAT_PLUGIN_FIFO_CONFIG_H

 #define FIFO_CONFIG_NAME "fifo"
-
+#define FIFO_CONFIG_PRIO_NAME (TO_STR(FIFO_PLUGIN_PRIORITY) "|" FIFO_CONFIG_NAME)

 extern struct t_config_option *fifo_config_file_enabled;
 extern struct t_config_option *fifo_config_file_path;
@@ -42,7 +42,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("FIFO pipe for remote control"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(9000);
+WEECHAT_PLUGIN_PRIORITY(FIFO_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_fifo_plugin = NULL;
 #define weechat_plugin weechat_fifo_plugin
@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_fifo_plugin
 #define FIFO_PLUGIN_NAME "fifo"
+#define FIFO_PLUGIN_PRIORITY 9000

 extern struct t_weechat_plugin *weechat_fifo_plugin;
 extern int fifo_quiet;
@@ -365,7 +365,7 @@ fset_config_init ()
 {
    struct t_config_section *ptr_section;

-    fset_config_file = weechat_config_new (FSET_CONFIG_NAME,
+    fset_config_file = weechat_config_new (FSET_CONFIG_PRIO_NAME,
                                           &fset_config_reload, NULL, NULL);
    if (!fset_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_FSET_CONFIG_H

 #define FSET_CONFIG_NAME "fset"
+#define FSET_CONFIG_PRIO_NAME (TO_STR(FSET_PLUGIN_PRIORITY) "|" FSET_CONFIG_NAME)

 extern struct t_config_file *fset_config_file;

@@ -40,7 +40,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Fast set of WeeChat and plugins options"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(2000);
+WEECHAT_PLUGIN_PRIORITY(FSET_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_fset_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_fset_plugin
 #define FSET_PLUGIN_NAME "fset"
+#define FSET_PLUGIN_PRIORITY 2000

 #define FSET_BAR_NAME "fset"

@@ -44,7 +44,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of scheme scripts (with Guile)"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4070);
+WEECHAT_PLUGIN_PRIORITY(GUILE_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_guile_plugin = NULL;

@@ -24,6 +24,7 @@

 #define weechat_plugin weechat_guile_plugin
 #define GUILE_PLUGIN_NAME "guile"
+#define GUILE_PLUGIN_PRIORITY 4070

 #define GUILE_CURRENT_SCRIPT_NAME ((guile_current_script) ? guile_current_script->name : "-")

@@ -2732,7 +2732,7 @@ irc_config_init ()
        WEECHAT_HASHTABLE_STRING,
        NULL, NULL);

-    irc_config_file = weechat_config_new (IRC_CONFIG_NAME,
+    irc_config_file = weechat_config_new (IRC_CONFIG_PRIO_NAME,
                                          &irc_config_reload, NULL, NULL);
    if (!irc_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_IRC_CONFIG_H

 #define IRC_CONFIG_NAME "irc"
+#define IRC_CONFIG_PRIO_NAME (TO_STR(IRC_PLUGIN_PRIORITY) "|" IRC_CONFIG_NAME)

 enum t_irc_config_look_server_buffer
 {
@@ -52,7 +52,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("IRC (Internet Relay Chat) protocol"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(6000);
+WEECHAT_PLUGIN_PRIORITY(IRC_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_irc_plugin = NULL;

@@ -23,6 +23,7 @@

 #define weechat_plugin weechat_irc_plugin
 #define IRC_PLUGIN_NAME "irc"
+#define IRC_PLUGIN_PRIORITY 6000

 extern struct t_weechat_plugin *weechat_irc_plugin;

@@ -35,11 +35,11 @@ extern "C"
 #include "weechat-js-v8.h"

 WEECHAT_PLUGIN_NAME(JS_PLUGIN_NAME);
-WEECHAT_PLUGIN_DESCRIPTION("Support of javascript scripts");
+WEECHAT_PLUGIN_DESCRIPTION(N_("Support of javascript scripts"));
 WEECHAT_PLUGIN_AUTHOR("Koka El Kiwi <kokakiwi@kokakiwi.net>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4060);
+WEECHAT_PLUGIN_PRIORITY(JS_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_js_plugin = NULL;

@@ -35,6 +35,7 @@

 #define weechat_plugin weechat_js_plugin
 #define JS_PLUGIN_NAME "javascript"
+#define JS_PLUGIN_PRIORITY 4060

 #define JS_CURRENT_SCRIPT_NAME ((js_current_script) ? js_current_script->name : "-")

@@ -462,7 +462,7 @@ logger_config_init ()
 {
    struct t_config_section *ptr_section;

-    logger_config_file = weechat_config_new (LOGGER_CONFIG_NAME,
+    logger_config_file = weechat_config_new (LOGGER_CONFIG_PRIO_NAME,
                                             NULL, NULL, NULL);
    if (!logger_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_LOGGER_CONFIG_H

 #define LOGGER_CONFIG_NAME "logger"
+#define LOGGER_CONFIG_PRIO_NAME (TO_STR(LOGGER_PLUGIN_PRIORITY) "|" LOGGER_CONFIG_NAME)

 extern struct t_config_option *logger_config_look_backlog;
 extern struct t_config_option *logger_config_look_backlog_conditions;
@@ -41,7 +41,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Log buffers to files"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(15000);
+WEECHAT_PLUGIN_PRIORITY(LOGGER_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_logger_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_logger_plugin
 #define LOGGER_PLUGIN_NAME "logger"
+#define LOGGER_PLUGIN_PRIORITY 15000

 #define LOGGER_LEVEL_DEFAULT 9

@@ -40,7 +40,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of lua scripts"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4050);
+WEECHAT_PLUGIN_PRIORITY(LUA_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_lua_plugin = NULL;

@@ -23,6 +23,7 @@

 #define weechat_plugin weechat_lua_plugin
 #define LUA_PLUGIN_NAME "lua"
+#define LUA_PLUGIN_PRIORITY 4050

 #define LUA_CURRENT_SCRIPT_NAME ((lua_current_script) ? lua_current_script->name : "-")

@@ -37,7 +37,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of perl scripts"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4040);
+WEECHAT_PLUGIN_PRIORITY(PERL_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_perl_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_perl_plugin
 #define PERL_PLUGIN_NAME "perl"
+#define PERL_PLUGIN_PRIORITY 4040

 #define PERL_CURRENT_SCRIPT_NAME ((perl_current_script) ? perl_current_script->name : "-")

@@ -53,7 +53,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of PHP scripts"));
 WEECHAT_PLUGIN_AUTHOR("Adam Saponara <as@php.net>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4030);
+WEECHAT_PLUGIN_PRIORITY(PHP_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_php_plugin = NULL;

@@ -36,6 +36,8 @@

 #define weechat_plugin weechat_php_plugin
 #define PHP_PLUGIN_NAME "php"
+#define PHP_PLUGIN_PRIORITY 4030
+
 #define PHP_WEECHAT_VERSION "0.1"

 #define PHP_CURRENT_SCRIPT_NAME ((php_current_script) ? php_current_script->name : "-")
@@ -356,7 +356,7 @@ plugin_config_delete_desc (const void *pointer, void *data,
 void
 plugin_config_init ()
 {
-    plugin_config_file = config_file_new (NULL, PLUGIN_CONFIG_NAME,
+    plugin_config_file = config_file_new (NULL, PLUGIN_CONFIG_PRIO_NAME,
                                          &plugin_config_reload, NULL, NULL);
    if (plugin_config_file)
    {
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_PLUGIN_CONFIG_H

 #define PLUGIN_CONFIG_NAME "plugins"
+#define PLUGIN_CONFIG_PRIO_NAME "100000|plugins"

 extern struct t_config_file *plugin_config;
 extern struct t_config_option *plugin_options;
@@ -39,8 +39,14 @@ plugin_script_config_init (struct t_weechat_plugin *weechat_plugin,
                           struct t_plugin_script_data *plugin_data)
 {
    struct t_config_section *ptr_section;
+    char str_prio_name[PATH_MAX];

-    *(plugin_data->config_file) = weechat_config_new (weechat_plugin->name,
+    snprintf (str_prio_name, sizeof (str_prio_name),
+              "%d|%s",
+              weechat_plugin->priority,
+              weechat_plugin->name);
+
+    *(plugin_data->config_file) = weechat_config_new (str_prio_name,
                                                      NULL, NULL, NULL);
    if (!(*plugin_data->config_file))
        return 0;
@@ -40,7 +40,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of python scripts"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4020);
+WEECHAT_PLUGIN_PRIORITY(PYTHON_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_python_plugin = NULL;

@@ -23,6 +23,7 @@

 #define weechat_plugin weechat_python_plugin
 #define PYTHON_PLUGIN_NAME "python"
+#define PYTHON_PLUGIN_PRIORITY 4020

 #define PYTHON_CURRENT_SCRIPT_NAME ((python_current_script) ? python_current_script->name : "-")

@@ -891,7 +891,7 @@ relay_config_init ()
 {
    struct t_config_section *ptr_section;

-    relay_config_file = weechat_config_new (RELAY_CONFIG_NAME,
+    relay_config_file = weechat_config_new (RELAY_CONFIG_PRIO_NAME,
                                            &relay_config_reload, NULL, NULL);
    if (!relay_config_file)
        return 0;
@@ -23,6 +23,7 @@
 #include <regex.h>

 #define RELAY_CONFIG_NAME "relay"
+#define RELAY_CONFIG_PRIO_NAME (TO_STR(RELAY_PLUGIN_PRIORITY) "|" RELAY_CONFIG_NAME)

 extern struct t_config_file *relay_config_file;
 extern struct t_config_section *relay_config_section_port;
@@ -42,7 +42,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Relay WeeChat data to remote application "
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(5000);
+WEECHAT_PLUGIN_PRIORITY(RELAY_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_relay_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_relay_plugin
 #define RELAY_PLUGIN_NAME "relay"
+#define RELAY_PLUGIN_PRIORITY 5000

 extern struct t_weechat_plugin *weechat_relay_plugin;

@@ -61,7 +61,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of ruby scripts"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4010);
+WEECHAT_PLUGIN_PRIORITY(RUBY_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_ruby_plugin = NULL;

@@ -23,6 +23,7 @@

 #define weechat_plugin weechat_ruby_plugin
 #define RUBY_PLUGIN_NAME "ruby"
+#define RUBY_PLUGIN_PRIORITY 4010

 #define RUBY_CURRENT_SCRIPT_NAME ((ruby_current_script) ? ruby_current_script->name : "-")

@@ -420,8 +420,9 @@ script_config_init ()
 {
    struct t_config_section *ptr_section;

-    script_config_file = weechat_config_new (SCRIPT_CONFIG_NAME,
-                                             &script_config_reload, NULL, NULL);
+    script_config_file = weechat_config_new (
+        SCRIPT_CONFIG_PRIO_NAME,
+        &script_config_reload, NULL, NULL);
    if (!script_config_file)
        return 0;

@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_SCRIPT_CONFIG_H

 #define SCRIPT_CONFIG_NAME "script"
+#define SCRIPT_CONFIG_PRIO_NAME (TO_STR(SCRIPT_PLUGIN_PRIORITY) "|" SCRIPT_CONFIG_NAME)

 struct t_script_repo;

@@ -42,7 +42,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Script manager"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(3000);
+WEECHAT_PLUGIN_PRIORITY(SCRIPT_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_script_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_script_plugin
 #define SCRIPT_PLUGIN_NAME "script"
+#define SCRIPT_PLUGIN_PRIORITY 3000

 #define SCRIPT_NUM_LANGUAGES 8

@@ -441,7 +441,7 @@ spell_config_init ()
 {
    struct t_config_section *ptr_section;

-    spell_config_file = weechat_config_new (SPELL_CONFIG_NAME,
+    spell_config_file = weechat_config_new (SPELL_CONFIG_PRIO_NAME,
                                            NULL, NULL, NULL);
    if (!spell_config_file)
        return 0;
@@ -22,7 +22,7 @@
 #define WEECHAT_PLUGIN_SPELL_CONFIG_H

 #define SPELL_CONFIG_NAME "spell"
-
+#define SPELL_CONFIG_PRIO_NAME (TO_STR(SPELL_PLUGIN_PRIORITY) "|" SPELL_CONFIG_NAME)

 extern struct t_config_option *spell_config_color_misspelled;
 extern struct t_config_option *spell_config_color_suggestion;
@@ -48,7 +48,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Spell checker for input"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(12000);
+WEECHAT_PLUGIN_PRIORITY(SPELL_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_spell_plugin = NULL;

@@ -29,6 +29,7 @@

 #define weechat_plugin weechat_spell_plugin
 #define SPELL_PLUGIN_NAME "spell"
+#define SPELL_PLUGIN_PRIORITY 12000

 struct t_spell_code
 {
@@ -40,7 +40,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Support of tcl scripts"));
 WEECHAT_PLUGIN_AUTHOR("Dmitry Kobylin <fnfal@academ.tsc.ru>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(4000);
+WEECHAT_PLUGIN_PRIORITY(TCL_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_tcl_plugin = NULL;

@@ -23,6 +23,7 @@

 #define weechat_plugin weechat_tcl_plugin
 #define TCL_PLUGIN_NAME "tcl"
+#define TCL_PLUGIN_PRIORITY 4000

 #define TCL_CURRENT_SCRIPT_NAME ((tcl_current_script) ? tcl_current_script->name : "-")

@@ -686,7 +686,8 @@ trigger_config_init ()
    struct t_config_section *ptr_section;

    trigger_config_file = weechat_config_new (
-        TRIGGER_CONFIG_NAME, &trigger_config_reload_cb, NULL, NULL);
+        TRIGGER_CONFIG_PRIO_NAME,
+        &trigger_config_reload_cb, NULL, NULL);
    if (!trigger_config_file)
        return 0;

@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_TRIGGER_CONFIG_H

 #define TRIGGER_CONFIG_NAME "trigger"
+#define TRIGGER_CONFIG_PRIO_NAME (TO_STR(TRIGGER_PLUGIN_PRIORITY) "|" TRIGGER_CONFIG_NAME)
 #define TRIGGER_CONFIG_SECTION_TRIGGER "trigger"

 extern struct t_config_file *trigger_config_file;
@@ -39,7 +39,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Text replacement and command execution on events
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(13000);
+WEECHAT_PLUGIN_PRIORITY(TRIGGER_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_trigger_plugin = NULL;

@@ -24,6 +24,7 @@

 #define weechat_plugin weechat_trigger_plugin
 #define TRIGGER_PLUGIN_NAME "trigger"
+#define TRIGGER_PLUGIN_PRIORITY 13000

 #define TRIGGER_HOOK_DEFAULT_CONDITIONS "${...}"
 #define TRIGGER_HOOK_DEFAULT_REGEX      "/abc/def"
@@ -113,7 +113,7 @@ typing_config_init ()
    struct t_config_section *ptr_section;

    typing_config_file = weechat_config_new (
-        TYPING_CONFIG_NAME,
+        TYPING_CONFIG_PRIO_NAME,
        &typing_config_reload, NULL, NULL);
    if (!typing_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_TYPING_CONFIG_H

 #define TYPING_CONFIG_NAME "typing"
+#define TYPING_CONFIG_PRIO_NAME (TO_STR(TYPING_PLUGIN_PRIORITY) "|" TYPING_CONFIG_NAME)

 extern struct t_config_option *typing_config_look_delay_purge_paused;
 extern struct t_config_option *typing_config_look_delay_purge_typing;
@@ -36,7 +36,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("Typing status of users"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(8000);
+WEECHAT_PLUGIN_PRIORITY(TYPING_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_typing_plugin = NULL;

@@ -22,6 +22,7 @@

 #define weechat_plugin weechat_typing_plugin
 #define TYPING_PLUGIN_NAME "typing"
+#define TYPING_PLUGIN_PRIORITY 8000

 struct t_typing
 {
@@ -248,6 +248,10 @@ struct timeval;
        return WEECHAT_RC_ERROR;                                        \
    }

+/* macro to convert integer to string */
+#define TO_STR_HELPER(x) #x
+#define TO_STR(x) TO_STR_HELPER(x)
+
 struct t_weechat_plugin
 {
    /* plugin variables */
@@ -114,7 +114,7 @@ xfer_config_init ()
 {
    struct t_config_section *ptr_section;

-    xfer_config_file = weechat_config_new (XFER_CONFIG_NAME,
+    xfer_config_file = weechat_config_new (XFER_CONFIG_PRIO_NAME,
                                           &xfer_config_reload, NULL, NULL);
    if (!xfer_config_file)
        return 0;
@@ -21,6 +21,7 @@
 #define WEECHAT_PLUGIN_XFER_CONFIG_H

 #define XFER_CONFIG_NAME "xfer"
+#define XFER_CONFIG_PRIO_NAME (TO_STR(XFER_PLUGIN_PRIORITY) "|" XFER_CONFIG_NAME)

 #define XFER_CONFIG_PROGRESS_BAR_MAX_SIZE 256

@@ -50,7 +50,7 @@ WEECHAT_PLUGIN_DESCRIPTION(N_("DCC file transfer and direct chat"));
 WEECHAT_PLUGIN_AUTHOR("Sébastien Helleu <flashcode@flashtux.org>");
 WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
 WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE);
-WEECHAT_PLUGIN_PRIORITY(7000);
+WEECHAT_PLUGIN_PRIORITY(XFER_PLUGIN_PRIORITY);

 struct t_weechat_plugin *weechat_xfer_plugin = NULL;

@@ -27,6 +27,7 @@

 #define weechat_plugin weechat_xfer_plugin
 #define XFER_PLUGIN_NAME "xfer"
+#define XFER_PLUGIN_PRIORITY 7000

 /* xfer types */