Partial migration of Perl plugin to new API

7 files changed, 55 insertions, 55 deletions

diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 5c515d161..993b4ea07 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -475,7 +475,8 @@ command_debug (void *data, struct t_gui_buffer *buffer,
         }
         else
         {
-            hook_signal_send ("debug", argv_eol[1]);
+            hook_signal_send ("debug",
+                              WEECHAT_HOOK_SIGNAL_STRING, argv_eol[1]);
         }
     }
     
@@ -1142,6 +1143,7 @@ command_quit (void *data, struct t_gui_buffer *buffer,
     (void) argv;
     
     hook_signal_send ("quit",
+                      WEECHAT_HOOK_SIGNAL_STRING,
                       (argc > 1) ?
                       argv_eol[1] : CONFIG_STRING(config_look_default_msg_quit));
     
@@ -1186,7 +1188,7 @@ command_reload (void *data, struct t_gui_buffer *buffer,
                          gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
 
     /* tell to plugins to reload their configuration */
-    hook_signal_send ("config_reload", NULL);
+    hook_signal_send ("config_reload", WEECHAT_HOOK_SIGNAL_STRING, NULL);
     
     return WEECHAT_RC_OK;
 }
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index cc5ea3693..ec7b5ce8f 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -1399,38 +1399,38 @@ config_file_print_log ()
          ptr_config_file = ptr_config_file->next_config)
     {
         log_printf ("");
-        log_printf ("[config (addr:0x%X)]", ptr_config_file);
-        log_printf ("  plugin . . . . . . . . : 0x%X", ptr_config_file->plugin);
+        log_printf ("[config (addr:0x%x)]", ptr_config_file);
+        log_printf ("  plugin . . . . . . . . : 0x%x", ptr_config_file->plugin);
         log_printf ("  filename . . . . . . . : '%s'", ptr_config_file->filename);
-        log_printf ("  file . . . . . . . . . : 0x%X", ptr_config_file->file);
-        log_printf ("  sections . . . . . . . : 0x%X", ptr_config_file->sections);
-        log_printf ("  last_section . . . . . : 0x%X", ptr_config_file->last_section);
-        log_printf ("  prev_config. . . . . . : 0x%X", ptr_config_file->prev_config);
-        log_printf ("  next_config. . . . . . : 0x%X", ptr_config_file->next_config);
+        log_printf ("  file . . . . . . . . . : 0x%x", ptr_config_file->file);
+        log_printf ("  sections . . . . . . . : 0x%x", ptr_config_file->sections);
+        log_printf ("  last_section . . . . . : 0x%x", ptr_config_file->last_section);
+        log_printf ("  prev_config. . . . . . : 0x%x", ptr_config_file->prev_config);
+        log_printf ("  next_config. . . . . . : 0x%x", ptr_config_file->next_config);
         
         for (ptr_section = ptr_config_file->sections; ptr_section;
              ptr_section = ptr_section->next_section)
         {
             log_printf ("");
-            log_printf ("    [section (addr:0x%X)]", ptr_section);
+            log_printf ("    [section (addr:0x%x)]", ptr_section);
             log_printf ("      name . . . . . . . . . : '%s'", ptr_section->name);
-            log_printf ("      callback_read. . . . . : 0x%X", ptr_section->callback_read);
-            log_printf ("      callback_write . . . . : 0x%X", ptr_section->callback_write);
-            log_printf ("      callback_write_default : 0x%X", ptr_section->callback_write_default);
-            log_printf ("      options. . . . . . . . : 0x%X", ptr_section->options);
-            log_printf ("      last_option. . . . . . : 0x%X", ptr_section->last_option);
-            log_printf ("      prev_section . . . . . : 0x%X", ptr_section->prev_section);
-            log_printf ("      next_section . . . . . : 0x%X", ptr_section->next_section);
+            log_printf ("      callback_read. . . . . : 0x%x", ptr_section->callback_read);
+            log_printf ("      callback_write . . . . : 0x%x", ptr_section->callback_write);
+            log_printf ("      callback_write_default : 0x%x", ptr_section->callback_write_default);
+            log_printf ("      options. . . . . . . . : 0x%x", ptr_section->options);
+            log_printf ("      last_option. . . . . . : 0x%x", ptr_section->last_option);
+            log_printf ("      prev_section . . . . . : 0x%x", ptr_section->prev_section);
+            log_printf ("      next_section . . . . . : 0x%x", ptr_section->next_section);
             
             for (ptr_option = ptr_section->options; ptr_option;
                  ptr_option = ptr_option->next_option)
             {
                 log_printf ("");
-                log_printf ("      [option (addr:0x%X)]", ptr_option);
+                log_printf ("      [option (addr:0x%x)]", ptr_option);
                 log_printf ("        name . . . . . . . . : '%s'", ptr_option->name);
                 log_printf ("        type . . . . . . . . : %d",   ptr_option->type);
                 log_printf ("        description. . . . . : '%s'", ptr_option->description);
-                log_printf ("        string_values. . . . : 0x%X", ptr_option->string_values);
+                log_printf ("        string_values. . . . : 0x%x", ptr_option->string_values);
                 log_printf ("        min. . . . . . . . . : %d",   ptr_option->min);
                 log_printf ("        max. . . . . . . . . : %d",   ptr_option->max);
                 switch (ptr_option->type)
@@ -1470,10 +1470,10 @@ config_file_print_log ()
                                     gui_color_get_name (CONFIG_COLOR(ptr_option)));
                         break;
                 }
-                log_printf ("        callback_change. . . : 0x%X", ptr_option->callback_change);
+                log_printf ("        callback_change. . . : 0x%x", ptr_option->callback_change);
                 log_printf ("        loaded . . . . . . . : %d",   ptr_option->loaded);
-                log_printf ("        prev_option. . . . . : 0x%X", ptr_option->prev_option);
-                log_printf ("        next_option. . . . . : 0x%X", ptr_option->next_option);
+                log_printf ("        prev_option. . . . . : 0x%x", ptr_option->prev_option);
+                log_printf ("        next_option. . . . . : 0x%x", ptr_option->next_option);
             }
         }
     }
diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c
index 0bec00964..02e92de78 100644
--- a/src/core/wee-hook.c
+++ b/src/core/wee-hook.c
@@ -849,7 +849,7 @@ hook_signal (struct t_weechat_plugin *plugin, char *signal,
  */
 
 void
-hook_signal_send (char *signal, void *signal_data)
+hook_signal_send (char *signal, char *type_data, void *signal_data)
 {
     struct t_hook *ptr_hook, *next_hook;
     
@@ -867,7 +867,7 @@ hook_signal_send (char *signal, void *signal_data)
         {
             ptr_hook->running = 1;
             (void) (HOOK_SIGNAL(ptr_hook, callback))
-                (ptr_hook->callback_data, signal, signal_data);
+                (ptr_hook->callback_data, signal, type_data, signal_data);
             ptr_hook->running = 0;
         }
         
@@ -1188,8 +1188,8 @@ hook_print_log ()
              ptr_hook = ptr_hook->next_hook)
         {
             log_printf ("");
-            log_printf ("[hook (addr:0x%X)]", ptr_hook);
-            log_printf ("  plugin . . . . . . . . : 0x%X ('%s')",
+            log_printf ("[hook (addr:0x%x)]", ptr_hook);
+            log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
                         ptr_hook->plugin,
                         (ptr_hook->plugin) ? ptr_hook->plugin->name : "");
             log_printf ("  deleted. . . . . . . . : %d",   ptr_hook->deleted);
@@ -1198,11 +1198,11 @@ hook_print_log ()
             {
                 case HOOK_TYPE_COMMAND:
                     log_printf ("  type . . . . . . . . . : %d (command)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  command data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_COMMAND(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_COMMAND(ptr_hook, callback));
                         log_printf ("    command. . . . . . . : '%s'", HOOK_COMMAND(ptr_hook, command));
                         log_printf ("    level. . . . . . . . : %d",   HOOK_COMMAND(ptr_hook, level));
                         log_printf ("    command_desc . . . . : '%s'", HOOK_COMMAND(ptr_hook, description));
@@ -1213,11 +1213,11 @@ hook_print_log ()
                     break;
                 case HOOK_TYPE_TIMER:
                     log_printf ("  type . . . . . . . . . : %d (timer)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  timer data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_TIMER(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_TIMER(ptr_hook, callback));
                         log_printf ("    interval . . . . . . : %ld",  HOOK_TIMER(ptr_hook, interval));
                         local_time = localtime (&HOOK_TIMER(ptr_hook, last_exec).tv_sec);
                         strftime (text_time, sizeof (text_time),
@@ -1237,54 +1237,54 @@ hook_print_log ()
                     break;
                 case HOOK_TYPE_FD:
                     log_printf ("  type . . . . . . . . . : %d (fd)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  fd data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_FD(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_FD(ptr_hook, callback));
                         log_printf ("    fd . . . . . . . . . : %ld",  HOOK_FD(ptr_hook, fd));
                         log_printf ("    flags. . . . . . . . : %ld",  HOOK_FD(ptr_hook, flags));
                     }
                     break;
                 case HOOK_TYPE_PRINT:
                     log_printf ("  type . . . . . . . . . : %d (print)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  print data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_PRINT(ptr_hook, callback));
-                        log_printf ("    buffer . . . . . . . : 0x%X", HOOK_PRINT(ptr_hook, buffer));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_PRINT(ptr_hook, callback));
+                        log_printf ("    buffer . . . . . . . : 0x%x", HOOK_PRINT(ptr_hook, buffer));
                         log_printf ("    message. . . . . . . : '%s'", HOOK_PRINT(ptr_hook, message));
                     }
                     break;
                 case HOOK_TYPE_SIGNAL:
                     log_printf ("  type . . . . . . . . . : %d (signal)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  signal data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_SIGNAL(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_SIGNAL(ptr_hook, callback));
                         log_printf ("    signal . . . . . . . : '%s'", HOOK_SIGNAL(ptr_hook, signal));
                     }
                     break;
                 case HOOK_TYPE_CONFIG:
                     log_printf ("  type . . . . . . . . . : %d (config)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  config data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_CONFIG(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_CONFIG(ptr_hook, callback));
                         log_printf ("    type . . . . . . . . : '%s'", HOOK_CONFIG(ptr_hook, type));
                         log_printf ("    option . . . . . . . : '%s'", HOOK_CONFIG(ptr_hook, option));
                     }
                     break;
                 case HOOK_TYPE_COMPLETION:
                     log_printf ("  type . . . . . . . . . : %d (completion)", ptr_hook->type);
-                    log_printf ("  callback_data. . . . . : 0x%X", ptr_hook->callback_data);
+                    log_printf ("  callback_data. . . . . : 0x%x", ptr_hook->callback_data);
                     if (!ptr_hook->deleted)
                     {
                         log_printf ("  completion data:");
-                        log_printf ("    callback . . . . . . : 0x%X", HOOK_COMPLETION(ptr_hook, callback));
+                        log_printf ("    callback . . . . . . : 0x%x", HOOK_COMPLETION(ptr_hook, callback));
                         log_printf ("    completion . . . . . : '%s'", HOOK_COMPLETION(ptr_hook, completion));
                     }
                     break;
@@ -1293,8 +1293,8 @@ hook_print_log ()
                        it is never used as type */
                     break;
             }
-            log_printf ("  prev_hook. . . . . . . : 0x%X", ptr_hook->prev_hook);
-            log_printf ("  next_hook. . . . . . . : 0x%X", ptr_hook->next_hook);
+            log_printf ("  prev_hook. . . . . . . : 0x%x", ptr_hook->prev_hook);
+            log_printf ("  next_hook. . . . . . . : 0x%x", ptr_hook->next_hook);
         }
     }
 }
diff --git a/src/core/wee-hook.h b/src/core/wee-hook.h
index dfa293b83..0975aef37 100644
--- a/src/core/wee-hook.h
+++ b/src/core/wee-hook.h
@@ -113,7 +113,7 @@ struct t_hook_print
 };
 
 typedef int (t_hook_callback_signal)(void *data, char *signal,
-                                     void *signal_data);
+                                     char *type_data, void *signal_data);
 
 struct t_hook_signal
 {
@@ -188,7 +188,8 @@ extern struct t_hook *hook_signal (struct t_weechat_plugin *plugin,
                                    char *signal,
                                    t_hook_callback_signal *callback,
                                    void *callback_data);
-extern void hook_signal_send (char *signal, void *signal_data);
+extern void hook_signal_send (char *signal, char *type_data,
+                              void *signal_data);
 extern struct t_hook *hook_config (struct t_weechat_plugin *, char *type,
                                    char *option,
                                    t_hook_callback_config *callback,
diff --git a/src/core/wee-list.c b/src/core/wee-list.c
index c92fcdac8..8f5e23262 100644
--- a/src/core/wee-list.c
+++ b/src/core/wee-list.c
@@ -30,6 +30,7 @@
 #include "wee-list.h"
 #include "wee-log.h"
 #include "wee-string.h"
+#include "../plugins/weechat-plugin.h"
 
 
 /*
@@ -97,9 +98,9 @@ weelist_insert (struct t_weelist *weelist, struct t_weelist_item *item,
     {
         /* search position for new element, according to pos asked */
         pos_item = NULL;
-        if (string_strcasecmp (where, WEELIST_POS_BEGINNING) == 0)
+        if (string_strcasecmp (where, WEECHAT_LIST_POS_BEGINNING) == 0)
             pos_item = weelist->items;
-        else if (string_strcasecmp (where, WEELIST_POS_END) == 0)
+        else if (string_strcasecmp (where, WEECHAT_LIST_POS_END) == 0)
             pos_item = NULL;
         else
             pos_item = weelist_find_pos (weelist, item->data);
@@ -353,13 +354,13 @@ weelist_print_log (struct t_weelist *weelist, char *name)
 {
     struct t_weelist_item *ptr_item;
     
-    log_printf ("[%s (addr:0x%X)]", name, weelist);
+    log_printf ("[%s (addr:0x%x)]", name, weelist);
     
     for (ptr_item = weelist->items; ptr_item;
          ptr_item = ptr_item->next_item)
     {
         log_printf ("  data . . . . . . . . . : '%s'", ptr_item->data);
-        log_printf ("  prev_item. . . . . . . : 0x%X", ptr_item->prev_item);
-        log_printf ("  next_item. . . . . . . : 0x%X", ptr_item->next_item);
+        log_printf ("  prev_item. . . . . . . : 0x%x", ptr_item->prev_item);
+        log_printf ("  next_item. . . . . . . : 0x%x", ptr_item->next_item);
     }
 }
diff --git a/src/core/wee-list.h b/src/core/wee-list.h
index 857bdeadd..3562217fe 100644
--- a/src/core/wee-list.h
+++ b/src/core/wee-list.h
@@ -20,10 +20,6 @@
 #ifndef __WEECHAT_LIST_H
 #define __WEECHAT_LIST_H 1
 
-#define WEELIST_POS_SORT      "sort"
-#define WEELIST_POS_BEGINNING "beginning"
-#define WEELIST_POS_END       "end"
-
 struct t_weelist_item
 {
     char *data;                        /* item data                         */
diff --git a/src/core/weechat.c b/src/core/weechat.c
index d2119745b..d2121a71a 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -521,7 +521,7 @@ weechat_dump (int crash)
     
     plugin_print_log ();
     
-    hook_signal_send ("dump_data", NULL);
+    hook_signal_send ("dump_data", WEECHAT_HOOK_SIGNAL_STRING, NULL);
     
     log_printf ("");
     log_printf ("******             End of WeeChat dump             ******");