Reintroduce /upgrade command, working only with core and IRC plugin today

Command will be improved in near future and other plugins like xfer
will be modified to manage upgrade process.

src/plugins/CMakeLists.txt

@@ -14,9 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SET(LIB_PLUGINS_SRC weechat-plugin.h plugin.c plugin.h plugin-api.c
-plugin-api.h plugin-config.h plugin-config.c plugin-infolist.c
-plugin-infolist.h)
+SET(LIB_PLUGINS_SRC
+weechat-plugin.h
+plugin.c plugin.h
+plugin-api.c plugin-api.h
+plugin-config.h plugin-config.c)
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})

src/plugins/Makefile.am

@@ -24,9 +24,7 @@ lib_weechat_plugins_a_SOURCES = weechat-plugin.h \
                                 plugin-api.c \
                                 plugin-api.h \
                                 plugin-config.c \
-                                plugin-config.h \
-                                plugin-infolist.c \
-                                plugin-infolist.h
+                                plugin-config.h
 
 if PLUGIN_ALIAS
 alias_dir = alias

src/plugins/demo/demo.c

@@ -203,11 +203,12 @@ demo_buffer_set_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
  */
 
 void
-demo_infolist_print (struct t_plugin_infolist *infolist, const char *item_name)
+demo_infolist_print (struct t_infolist *infolist, const char *item_name)
 {
     char *fields, **argv;
-    int i, j, argc;
-    time_t date;
+    void *pointer;
+    int i, j, argc, size;
+    time_t time;
     
     i = 1;
     while (weechat_infolist_next (infolist))
@@ -241,11 +242,20 @@ demo_infolist_print (struct t_plugin_infolist *infolist, const char *item_name)
                                             weechat_infolist_pointer (infolist,
                                                                       argv[j] + 2));
                             break;
+                        case 'b':
+                            pointer = weechat_infolist_buffer (infolist,
+                                                               argv[j] + 2,
+                                                               &size);
+                            weechat_printf (NULL, "  %s: %X (size: %d)",
+                                            argv[j] + 2,
+                                            pointer,
+                                            size);
+                            break;
                         case 't':
-                            date = weechat_infolist_time (infolist, argv[j] + 2);
+                            time = weechat_infolist_time (infolist, argv[j] + 2);
                             weechat_printf (NULL, "  %s: (%ld) %s",
                                             argv[j] + 2,
-                                            date, ctime (&date));
+                                            time, ctime (&time));
                             break;
                     }
                 }
@@ -265,7 +275,7 @@ int
 demo_infolist_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
                           char **argv, char **argv_eol)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     
     /* make C compiler happy */
     (void) data;

src/plugins/irc/CMakeLists.txt

@@ -28,7 +28,8 @@ irc-input.c irc-input.h
 irc-mode.c irc-mode.h
 irc-nick.c irc-nick.h
 irc-protocol.c irc-protocol.h
-irc-server.c irc-server.h)
+irc-server.c irc-server.h
+irc-upgrade.c irc-upgrade.h)
 SET_TARGET_PROPERTIES(irc PROPERTIES PREFIX "")
 
 CHECK_INCLUDE_FILES("regex.h" HAVE_REGEX_H)

src/plugins/irc/Makefile.am

@@ -47,7 +47,9 @@ irc_la_SOURCES = irc.c \
                  irc-protocol.c \
                  irc-protocol.h \
                  irc-server.c \
-                 irc-server.h
+                 irc-server.h \
+                 irc-upgrade.c \
+                 irc-upgrade.h
 
 irc_la_LDFLAGS = -module
 irc_la_LIBADD  = $(IRC_LFLAGS) $(GNUTLS_LFLAGS)

src/plugins/irc/irc-channel.c

@@ -53,16 +53,23 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
                         weechat_prefix ("error"), "irc");
         return NULL;
     }
-
-    /* create buffer for channel */
-    new_buffer = weechat_buffer_new (server->name, channel_name,
-                                     &irc_input_data_cb, NULL,
-                                     &irc_buffer_close_cb, NULL);
-    if (!new_buffer)
+    
+    /* create buffer for channel (or use existing one) */
+    new_buffer = weechat_buffer_search (server->name, channel_name);
+    if (new_buffer)
+        weechat_nicklist_remove_all (new_buffer);
+    else
     {
-        free (new_channel);
-        return NULL;
+        new_buffer = weechat_buffer_new (server->name, channel_name,
+                                         &irc_input_data_cb, NULL,
+                                         &irc_buffer_close_cb, NULL);
+        if (!new_buffer)
+        {
+            free (new_channel);
+            return NULL;
+        }
     }
+    
     if (channel_type == IRC_CHANNEL_TYPE_CHANNEL)
     {
         weechat_buffer_set (new_buffer, "nick", server->nick);
@@ -124,6 +131,20 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
     return new_channel;
 }
 
+/*
+ * irc_channel_set_topic: set topic for a channel
+ */
+
+void
+irc_channel_set_topic (struct t_irc_channel *channel, char *topic)
+{
+    if (channel->topic)
+        free (channel->topic);
+    
+    channel->topic = (topic) ? strdup (topic) : NULL;
+    weechat_buffer_set (channel->buffer, "title", channel->topic);
+}
+
 /*
  * irc_channel_free: free a channel and remove it from channels list
  */
@@ -353,6 +374,52 @@ irc_channel_add_nick_speaking (struct t_irc_channel *channel, const char *nick)
     }
 }
 
+/*
+ * irc_channel_add_to_infolist: add a channel in an infolist
+ *                              return 1 if ok, 0 if error
+ */
+
+int
+irc_channel_add_to_infolist (struct t_infolist *infolist,
+                             struct t_irc_channel *channel)
+{
+    struct t_infolist_item *ptr_item;
+    
+    if (!infolist || !channel)
+        return 0;
+    
+    ptr_item = weechat_infolist_new_item (infolist);
+    if (!ptr_item)
+        return 0;
+    
+    if (!weechat_infolist_new_var_integer (ptr_item, "type", channel->type))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "name", channel->name))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "topic", channel->topic))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "modes", channel->modes))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "limit", channel->limit))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "key", channel->key))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "nicks_count", channel->nicks_count))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "checking_away", channel->checking_away))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "away_message", channel->away_message))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "cycle", channel->cycle))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "display_creation_date", channel->display_creation_date))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "nick_completion_reset", channel->nick_completion_reset))
+        return 0;
+    
+    return 1;
+}
+
 /*
  * irc_channel_print_log: print channel infos in log (usually for crash dump)
  */

src/plugins/irc/irc-channel.h

@@ -58,6 +58,7 @@ extern struct t_irc_channel *irc_channel_new (struct t_irc_server *server,
                                               int channel_type,
                                               const char *channel_name,
                                               int switch_to_channel);
+extern void irc_channel_set_topic (struct t_irc_channel *channel, char *topic);
 extern void irc_channel_free (struct t_irc_server *server,
                               struct t_irc_channel *channel);
 extern void irc_channel_free_all (struct t_irc_server *server);
@@ -75,6 +76,8 @@ extern void irc_channel_set_away (struct t_irc_channel *channel, const char *nic
                                   int is_away);
 extern void irc_channel_add_nick_speaking (struct t_irc_channel *channel,
                                            const char *nick);
+extern int irc_channel_add_to_infolist (struct t_infolist *infolist,
+                                        struct t_irc_channel *channel);
 extern void irc_channel_print_log (struct t_irc_channel *channel);
 
 #endif /* irc-channel.h */

src/plugins/irc/irc-command.c

@@ -860,8 +860,8 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
     struct sockaddr_in addr;
     socklen_t length;
     unsigned long address;
-    struct t_plugin_infolist *infolist;
-    struct t_plugin_infolist_item *item;
+    struct t_infolist *infolist;
+    struct t_infolist_item *item;
     char plugin_id[128], str_address[128];
     
     IRC_GET_SERVER_CHANNEL(buffer);

src/plugins/irc/irc-config.c

@@ -295,7 +295,7 @@ irc_config_server_delete_cb (void *data, struct t_config_option *option)
     int i, index_option, length;
     char *name, *mask;
     struct t_irc_server *ptr_server;
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     
     index_option = irc_config_search_server_option (data);
     if (index_option >= 0)
@@ -340,7 +340,7 @@ irc_config_server_delete_cb (void *data, struct t_config_option *option)
 void
 irc_config_reload_servers_from_config ()
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_irc_server *ptr_server;
     struct t_config_option *ptr_option;
     char *name, *full_name, *server_name, *pos_option;

src/plugins/irc/irc-nick.c

@@ -555,6 +555,36 @@ irc_nick_as_prefix (struct t_irc_nick *nick, const char *nickname,
     return result;
 }
 
+/*
+ * irc_nick_add_to_infolist: add a nick in an infolist
+ *                           return 1 if ok, 0 if error
+ */
+
+int
+irc_nick_add_to_infolist (struct t_infolist *infolist,
+                          struct t_irc_nick *nick)
+{
+    struct t_infolist_item *ptr_item;
+    
+    if (!infolist || !nick)
+        return 0;
+    
+    ptr_item = weechat_infolist_new_item (infolist);
+    if (!ptr_item)
+        return 0;
+    
+    if (!weechat_infolist_new_var_string (ptr_item, "name", nick->name))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "host", nick->host))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "flags", nick->flags))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "color", nick->color))
+        return 0;
+    
+    return 1;
+}
+
 /*
  * irc_nick_print_log: print nick infos in log (usually for crash dump)
  */

src/plugins/irc/irc-nick.h

@@ -24,11 +24,11 @@
 
 #define IRC_NICK_CHANOWNER  1
 #define IRC_NICK_CHANADMIN  2
-#define IRC_NICK_OP         4
-#define IRC_NICK_HALFOP     8
-#define IRC_NICK_VOICE      16
-#define IRC_NICK_AWAY       32
-#define IRC_NICK_CHANADMIN2 64
+#define IRC_NICK_CHANADMIN2 4
+#define IRC_NICK_OP         8
+#define IRC_NICK_HALFOP     16
+#define IRC_NICK_VOICE      32
+#define IRC_NICK_AWAY       64
 #define IRC_NICK_CHANUSER   128
 #define IRC_NICK_SET_FLAG(nick, set, flag) \
     if (set) \
@@ -79,6 +79,8 @@ extern void irc_nick_set_away (struct t_irc_channel *channel,
                                struct t_irc_nick *nick, int is_away);
 extern char *irc_nick_as_prefix (struct t_irc_nick *nick, const char *nickname,
                                  const char *force_color);
+extern int irc_nick_add_to_infolist (struct t_infolist *infolist,
+                                     struct t_irc_nick *nick);
 extern void irc_nick_print_log (struct t_irc_nick *nick);
 
 #endif /* irc-nick.h */

src/plugins/irc/irc-protocol.c

@@ -300,11 +300,8 @@ irc_protocol_cmd_join (struct t_irc_server *server, const char *command,
     if (!ptr_channel->nicks)
     {
         if (ptr_channel->topic)
-        {
-            free (ptr_channel->topic);
-            ptr_channel->topic = NULL;
-            weechat_buffer_set (ptr_channel->buffer, "title", NULL);
-        }
+            irc_channel_set_topic (ptr_channel, NULL);
+        
         ptr_channel->display_creation_date = 1;
     }
     
@@ -758,11 +755,7 @@ irc_protocol_cmd_notice (struct t_irc_server *server, const char *command,
                     }
                 }
                 if (!ptr_channel->topic)
-                {
-                    ptr_channel->topic = strdup ((host) ? host : "");
-                    weechat_buffer_set (ptr_channel->buffer,
-                                        "title", ptr_channel->topic);
-                }
+                    irc_channel_set_topic (ptr_channel, host);
                 
                 weechat_printf_tags (ptr_channel->buffer,
                                      tags,
@@ -1058,8 +1051,8 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command,
 {
     char *nick, *host, *pos_args, *pos_end_01, *pos, *pos_message;
     char *dcc_args, *pos_file, *pos_addr, *pos_port, *pos_size, *pos_start_resume;  /* for DCC */
-    struct t_plugin_infolist *infolist;
-    struct t_plugin_infolist_item *item;
+    struct t_infolist *infolist;
+    struct t_infolist_item *item;
     char plugin_id[128];
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
@@ -1770,12 +1763,8 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command,
                 }
             }
             if (!ptr_channel->topic)
-            {
-                ptr_channel->topic = strdup (host);
-                weechat_buffer_set (ptr_channel->buffer,
-                                    "title", ptr_channel->topic);
-            }
-                    
+                irc_channel_set_topic (ptr_channel, host);
+            
             pos_args += 8;
             pos_end_01 = strchr (pos, '\01');
             if (pos_end_01)
@@ -1877,11 +1866,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command,
                         return WEECHAT_RC_ERROR;
                     }
                 }
-                if (ptr_channel->topic)
-                    free (ptr_channel->topic);
-                ptr_channel->topic = strdup (host);
-                weechat_buffer_set (ptr_channel->buffer, "title",
-                                    ptr_channel->topic);
+                irc_channel_set_topic (ptr_channel, host);
                 
                 weechat_printf_tags (ptr_channel->buffer,
                                      "irc_privmsg,notify_private",
@@ -2112,15 +2097,7 @@ irc_protocol_cmd_topic (struct t_irc_server *server, const char *command,
     }
     
     if (ptr_channel)
-    {
-        if (ptr_channel->topic)
-            free (ptr_channel->topic);
-        if (pos_topic)
-            ptr_channel->topic = strdup (pos_topic);
-        else
-            ptr_channel->topic = strdup ("");
-        weechat_buffer_set (ptr_channel->buffer, "title", ptr_channel->topic);
-    }
+        irc_channel_set_topic (ptr_channel, pos_topic);
     
     return WEECHAT_RC_OK;
 }
@@ -3022,12 +2999,7 @@ irc_protocol_cmd_332 (struct t_irc_server *server, const char *command,
     ptr_channel = irc_channel_search (server, argv[3]);
     
     if (ptr_channel && ptr_channel->nicks)
-    {
-        if (ptr_channel->topic)
-            free (ptr_channel->topic);
-        ptr_channel->topic = strdup (pos_topic);
-        weechat_buffer_set (ptr_channel->buffer, "title", ptr_channel->topic);
-    }
+        irc_channel_set_topic (ptr_channel, pos_topic);
     
     weechat_printf_tags ((ptr_channel && ptr_channel->nicks) ?
                          ptr_channel->buffer : server->buffer,
@@ -3567,7 +3539,7 @@ irc_protocol_cmd_366 (struct t_irc_server *server, const char *command,
                       int argc, char **argv, char **argv_eol)
 {
     struct t_irc_channel *ptr_channel;
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_config_option *ptr_option;
     int num_nicks, num_op, num_halfop, num_voice, num_normal, length, i;
     char *string, *prefix;

src/plugins/irc/irc-server.c

@@ -227,14 +227,14 @@ irc_server_set_nick (struct t_irc_server *server, const char *nick)
         free (server->nick);
     server->nick = (nick) ? strdup (nick) : NULL;
     
-    weechat_buffer_set (server->buffer, "nick", nick);
+    weechat_buffer_set (server->buffer, "nick", (void *)nick);
     
-    weechat_buffer_set (server->buffer, "highlight_words", nick);
+    weechat_buffer_set (server->buffer, "highlight_words", (void *)nick);
     
     for (ptr_channel = server->channels; ptr_channel;
          ptr_channel = ptr_channel->next_channel)
     {
-        weechat_buffer_set (ptr_channel->buffer, "nick", nick);
+        weechat_buffer_set (ptr_channel->buffer, "nick", (void *)nick);
     }
 }
 
@@ -770,7 +770,7 @@ irc_server_rename (struct t_irc_server *server, const char *new_name)
 {
     int length;
     char *option_name, *name, *pos_option;
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_config_option *ptr_option;
     
     /* check if another server exists with this name */
@@ -1765,7 +1765,7 @@ irc_server_connect_cb (void *arg_server, int status)
             irc_server_login (server);
             server->hook_fd = weechat_hook_fd (server->sock,
                                                1, 0, 0,
-                                               irc_server_recv_cb,
+                                               &irc_server_recv_cb,
                                                server);
             break;
         case WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
@@ -2353,7 +2353,7 @@ int
 irc_server_xfer_send_ready_cb (void *data, const char *signal,
                                const char *type_data, void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_irc_server *server, *ptr_server;
     char *plugin_name, *plugin_id, *type, *filename;
     int spaces_in_name;
@@ -2363,7 +2363,7 @@ irc_server_xfer_send_ready_cb (void *data, const char *signal,
     (void) signal;
     (void) type_data;
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (weechat_infolist_next (infolist))
     {
@@ -2426,7 +2426,7 @@ int
 irc_server_xfer_resume_ready_cb (void *data, const char *signal,
                                  const char *type_data, void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_irc_server *server, *ptr_server;
     char *plugin_name, *plugin_id, *filename;
     int spaces_in_name;
@@ -2436,7 +2436,7 @@ irc_server_xfer_resume_ready_cb (void *data, const char *signal,
     (void) signal;
     (void) type_data;
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (weechat_infolist_next (infolist))
     {
@@ -2483,7 +2483,7 @@ irc_server_xfer_send_accept_resume_cb (void *data, const char *signal,
                                        const char *type_data,
                                        void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_irc_server *server, *ptr_server;
     char *plugin_name, *plugin_id, *filename;
     int spaces_in_name;
@@ -2493,7 +2493,7 @@ irc_server_xfer_send_accept_resume_cb (void *data, const char *signal,
     (void) signal;
     (void) type_data;
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (weechat_infolist_next (infolist))
     {
@@ -2527,6 +2527,103 @@ irc_server_xfer_send_accept_resume_cb (void *data, const char *signal,
     return WEECHAT_RC_OK;
 }
 
+/*
+ * irc_server_add_to_infolist: add a server in an infolist
+ *                             return 1 if ok, 0 if error
+ */
+
+int
+irc_server_add_to_infolist (struct t_infolist *infolist,
+                            struct t_irc_server *server)
+{
+    struct t_infolist_item *ptr_item;
+    
+    if (!infolist || !server)
+        return 0;
+    
+    ptr_item = weechat_infolist_new_item (infolist);
+    if (!ptr_item)
+        return 0;
+    
+    if (!weechat_infolist_new_var_string (ptr_item, "name", server->name))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "autoconnect", server->autoconnect))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "autoreconnect", server->autoreconnect))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "autoreconnect_delay", server->autoreconnect_delay))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "temp_server", server->temp_server))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "addresses", server->addresses))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "ipv6", server->ipv6))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "ssl", server->ssl))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "password", server->password))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "nicks", server->nicks))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "username", server->username))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "realname", server->realname))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "local_hostname", server->local_hostname))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "command", server->command))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "command_delay", server->command_delay))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "autojoin", server->autojoin))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "autorejoin", server->autorejoin))
+        return 0;
+
+    if (!weechat_infolist_new_var_integer (ptr_item, "current_address", server->current_address))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "sock", server->sock))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "is_connected", server->is_connected))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "ssl_connected", server->ssl_connected))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "unterminated_message", server->unterminated_message))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "nick", server->nick))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", server->nick_modes))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "prefix", server->prefix))
+        return 0;
+    if (!weechat_infolist_new_var_time (ptr_item, "reconnect_start", server->reconnect_start))
+        return 0;
+    if (!weechat_infolist_new_var_time (ptr_item, "command_time", server->command_time))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "reconnect_join", server->reconnect_join))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "disable_autojoin", server->disable_autojoin))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "is_away", server->is_away))
+        return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "away_message", server->away_message))
+        return 0;
+    if (!weechat_infolist_new_var_time (ptr_item, "away_time", server->away_time))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "lag", server->lag))
+        return 0;
+    if (!weechat_infolist_new_var_buffer (ptr_item, "lag_check_time", &(server->lag_check_time), sizeof (struct timeval)))
+        return 0;
+    if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", server->lag_next_check))
+        return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "queue_msg", server->queue_msg))
+        return 0;
+    if (!weechat_infolist_new_var_time (ptr_item, "last_user_message", server->last_user_message))
+        return 0;
+    
+    return 1;
+}
+
 /*
  * irc_server_print_log: print server infos in log (usually for crash dump)
  */

src/plugins/irc/irc-server.h

@@ -169,6 +169,7 @@ extern int irc_server_connect (struct t_irc_server *server,
                                int disable_autojoin);
 extern void irc_server_auto_connect (int auto_connect, int temp_server);
 extern void irc_server_autojoin_channels ();
+extern int irc_server_recv_cb (void *arg_server);
 extern int irc_server_timer_cb (void *data);
 extern void irc_server_outqueue_free_all (struct t_irc_server *server);
 extern int irc_server_get_channel_count (struct t_irc_server *server);
@@ -189,6 +190,8 @@ extern int irc_server_xfer_resume_ready_cb (void *data, const char *signal,
 extern int irc_server_xfer_send_accept_resume_cb (void *data, const char *signal,
                                                   const char *type_data,
                                                   void *signal_data);
+extern int irc_server_add_to_infolist (struct t_infolist *infolist,
+                                       struct t_irc_server *server);
 extern void irc_server_print_log ();
 
 #endif /* irc-server.h */

src/plugins/irc/irc-upgrade.c

@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* irc-upgrade.c: save/restore IRC plugin data */
+
+
+#include <string.h>
+
+#include "../weechat-plugin.h"
+#include "irc.h"
+#include "irc-upgrade.h"
+#include "irc-buffer.h"
+#include "irc-input.h"
+#include "irc-server.h"
+#include "irc-channel.h"
+#include "irc-nick.h"
+
+
+struct t_irc_server *irc_upgrade_current_server = NULL;
+struct t_irc_channel *irc_upgrade_current_channel = NULL;
+
+
+/*
+ * irc_upgrade_save_all_data: save servers/channels/nicks info to upgrade file
+ */
+
+int
+irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
+{
+    struct t_infolist *infolist;
+    struct t_irc_server *ptr_server;
+    struct t_irc_channel *ptr_channel;
+    struct t_irc_nick *ptr_nick;
+    int rc;
+    
+    for (ptr_server = irc_servers; ptr_server;
+         ptr_server = ptr_server->next_server)
+    {
+        /* save server */
+        infolist = weechat_infolist_new ();
+        if (!infolist)
+            return 0;
+        if (!irc_server_add_to_infolist (infolist, ptr_server))
+        {
+            weechat_infolist_free (infolist);
+            return 0;
+        }
+        rc = weechat_upgrade_write_object (upgrade_file,
+                                           IRC_UPGRADE_TYPE_SERVER,
+                                           infolist);
+        weechat_infolist_free (infolist);
+        if (!rc)
+            return 0;
+        
+        for (ptr_channel = ptr_server->channels; ptr_channel;
+             ptr_channel = ptr_channel->next_channel)
+        {
+            /* save channel */
+            infolist = weechat_infolist_new ();
+            if (!infolist)
+                return 0;
+            if (!irc_channel_add_to_infolist (infolist, ptr_channel))
+            {
+                weechat_infolist_free (infolist);
+                return 0;
+            }
+            rc = weechat_upgrade_write_object (upgrade_file,
+                                               IRC_UPGRADE_TYPE_CHANNEL,
+                                               infolist);
+            weechat_infolist_free (infolist);
+            if (!rc)
+                return 0;
+            
+            for (ptr_nick = ptr_channel->nicks; ptr_nick;
+                 ptr_nick = ptr_nick->next_nick)
+            {
+                /* save nick */
+                infolist = weechat_infolist_new ();
+                if (!infolist)
+                    return 0;
+                if (!irc_nick_add_to_infolist (infolist, ptr_nick))
+                {
+                    weechat_infolist_free (infolist);
+                    return 0;
+                }
+                rc = weechat_upgrade_write_object (upgrade_file,
+                                                   IRC_UPGRADE_TYPE_NICK,
+                                                   infolist);
+                weechat_infolist_free (infolist);
+                if (!rc)
+                    return 0;
+            }
+        }
+    }
+    
+    return 1;
+}
+
+/*
+ * irc_upgrade_save: save upgrade file
+ *                   return 1 if ok, 0 if error
+ */
+
+int
+irc_upgrade_save ()
+{
+    int rc;
+    struct t_upgrade_file *upgrade_file;
+    
+    upgrade_file = weechat_upgrade_create (IRC_UPGRADE_FILENAME, 1);
+    if (!upgrade_file)
+        return 0;
+    
+    rc = irc_upgrade_save_all_data (upgrade_file);
+    
+    weechat_upgrade_close (upgrade_file);
+    
+    return rc;
+}
+
+/*
+ * irc_upgrade_set_buffer_callbacks: restore buffers callbacks (input and
+ *                                   close) for buffers created by IRC plugin
+ */
+
+void
+irc_upgrade_set_buffer_callbacks ()
+{
+    struct t_infolist *infolist;
+    struct t_gui_buffer *ptr_buffer;
+    
+    infolist = weechat_infolist_get ("buffer", NULL, NULL);
+    if (infolist)
+    {
+        while (weechat_infolist_next (infolist))
+        {
+            if (weechat_infolist_pointer (infolist, "plugin") == weechat_irc_plugin)
+            {
+                ptr_buffer = weechat_infolist_pointer (infolist, "pointer");
+                weechat_buffer_set (ptr_buffer, "close_callback", &irc_buffer_close_cb);
+                weechat_buffer_set (ptr_buffer, "input_callback", &irc_input_data_cb);
+            }
+        }
+    }
+}
+
+/*
+ * irc_upgrade_read_cb: read callback for 
+ */
+
+int
+irc_upgrade_read_cb (int object_id,
+                     struct t_infolist *infolist)
+{
+    int flags, sock, size;
+    char *str, *buf;
+    struct t_irc_nick *ptr_nick;
+    
+    weechat_infolist_reset_item_cursor (infolist);
+    while (weechat_infolist_next (infolist))
+    {
+        switch (object_id)
+        {
+            case IRC_UPGRADE_TYPE_SERVER:
+                irc_upgrade_current_server = irc_server_search (weechat_infolist_string (infolist, "name"));
+                if (irc_upgrade_current_server)
+                {
+                    irc_upgrade_current_server->buffer = weechat_buffer_search (irc_upgrade_current_server->name,
+                                                                                irc_upgrade_current_server->name);
+                    irc_upgrade_current_server->current_address = weechat_infolist_integer (infolist, "current_address");
+                    
+                    sock = weechat_infolist_integer (infolist, "sock");
+                    if (sock >= 0)
+                    {
+                        irc_upgrade_current_server->sock = sock;
+                        irc_upgrade_current_server->hook_fd = weechat_hook_fd (irc_upgrade_current_server->sock,
+                                                                               1, 0, 0,
+                                                                               &irc_server_recv_cb,
+                                                                               irc_upgrade_current_server);
+                    }
+                    irc_upgrade_current_server->is_connected = weechat_infolist_integer (infolist, "is_connected");
+                    irc_upgrade_current_server->ssl_connected = weechat_infolist_integer (infolist, "ssl_connected");
+                    str = weechat_infolist_string (infolist, "unterminated_message");
+                    if (str)
+                        irc_upgrade_current_server->unterminated_message = strdup (str);
+                    str = weechat_infolist_string (infolist, "nick");
+                    if (str)
+                        irc_server_set_nick (irc_upgrade_current_server, str);
+                    str = weechat_infolist_string (infolist, "nick_modes");
+                    if (str)
+                        irc_upgrade_current_server->nick_modes = strdup (str);
+                    str = weechat_infolist_string (infolist, "prefix");
+                    if (str)
+                        irc_upgrade_current_server->prefix = strdup (str);
+                    irc_upgrade_current_server->reconnect_start = weechat_infolist_time (infolist, "reconnect_start");
+                    irc_upgrade_current_server->command_time = weechat_infolist_time (infolist, "command_time");
+                    irc_upgrade_current_server->reconnect_join = weechat_infolist_integer (infolist, "reconnect_join");
+                    irc_upgrade_current_server->disable_autojoin = weechat_infolist_integer (infolist, "disable_autojoin");
+                    irc_upgrade_current_server->is_away = weechat_infolist_integer (infolist, "is_away");
+                    str = weechat_infolist_string (infolist, "away_message");
+                    if (str)
+                        irc_upgrade_current_server->away_message = strdup (str);
+                    irc_upgrade_current_server->away_time = weechat_infolist_time (infolist, "away_time");
+                    irc_upgrade_current_server->lag = weechat_infolist_integer (infolist, "lag");
+                    buf = weechat_infolist_buffer (infolist, "lag_check_time", &size);
+                    if (buf)
+                        memcpy (&(irc_upgrade_current_server->lag_check_time), buf, size);
+                    irc_upgrade_current_server->lag_next_check = weechat_infolist_time (infolist, "lag_next_check");
+                    irc_upgrade_current_server->queue_msg = weechat_infolist_integer (infolist, "queue_msg");
+                    irc_upgrade_current_server->last_user_message = weechat_infolist_time (infolist, "last_user_message");
+                }
+                break;
+            case IRC_UPGRADE_TYPE_CHANNEL:
+                if (irc_upgrade_current_server)
+                {
+                    irc_upgrade_current_channel = irc_channel_new (irc_upgrade_current_server,
+                                                                   weechat_infolist_integer (infolist, "type"),
+                                                                   weechat_infolist_string (infolist, "name"),
+                                                                   0);
+                    if (irc_upgrade_current_channel)
+                    {
+                        str = weechat_infolist_string (infolist, "topic");
+                        if (str)
+                            irc_channel_set_topic (irc_upgrade_current_channel, str);
+                        str = weechat_infolist_string (infolist, "modes");
+                        if (str)
+                            irc_upgrade_current_channel->modes = strdup (str);
+                        irc_upgrade_current_channel->limit = weechat_infolist_integer (infolist, "limit");
+                        str = weechat_infolist_string (infolist, "key");
+                        if (str)
+                            irc_upgrade_current_channel->key = strdup (str);
+                        irc_upgrade_current_channel->checking_away = weechat_infolist_integer (infolist, "checking_away");
+                        str = weechat_infolist_string (infolist, "away_message");
+                        if (str)
+                            irc_upgrade_current_channel->away_message = strdup (str);
+                        irc_upgrade_current_channel->cycle = weechat_infolist_integer (infolist, "cycle");
+                        irc_upgrade_current_channel->display_creation_date = weechat_infolist_integer (infolist, "display_creation_date");
+                        irc_upgrade_current_channel->nick_completion_reset = weechat_infolist_integer (infolist, "nick_completion_reset");
+                    }
+                }
+                break;
+            case IRC_UPGRADE_TYPE_NICK:
+                if (irc_upgrade_current_server && irc_upgrade_current_channel)
+                {
+                    flags = weechat_infolist_integer (infolist, "flags");
+                    ptr_nick = irc_nick_new (irc_upgrade_current_server,
+                                             irc_upgrade_current_channel,
+                                             weechat_infolist_string (infolist, "name"),
+                                             flags & IRC_NICK_CHANOWNER,
+                                             flags & IRC_NICK_CHANADMIN,
+                                             flags & IRC_NICK_CHANADMIN2,
+                                             flags & IRC_NICK_OP,
+                                             flags & IRC_NICK_HALFOP,
+                                             flags & IRC_NICK_VOICE,
+                                             flags & IRC_NICK_CHANUSER);
+                    if (ptr_nick)
+                    {
+                        str = weechat_infolist_string (infolist, "host");
+                        if (str)
+                            ptr_nick->host = strdup (str);
+                    }
+                }
+                break;
+        }
+    }
+    
+    return WEECHAT_RC_OK;
+}
+
+/*
+ * irc_upgrade_load: load upgrade file
+ *                   return 1 if ok, 0 if error
+ */
+
+int
+irc_upgrade_load ()
+{
+    int rc;
+    struct t_upgrade_file *upgrade_file;
+
+    irc_upgrade_set_buffer_callbacks ();
+    
+    upgrade_file = weechat_upgrade_create (IRC_UPGRADE_FILENAME, 0);
+    rc = weechat_upgrade_read (upgrade_file, &irc_upgrade_read_cb);
+    
+    return rc;
+}
+

src/plugins/irc/irc-upgrade.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __WEECHAT_IRC_UPGRADE_H
+#define __WEECHAT_IRC_UPGRADE_H 1
+
+#define IRC_UPGRADE_FILENAME "irc"
+
+/* For developers: please add new values ONLY AT THE END of enums */
+
+enum t_irc_upgrade_type
+{
+    IRC_UPGRADE_TYPE_SERVER = 0,
+    IRC_UPGRADE_TYPE_CHANNEL,
+    IRC_UPGRADE_TYPE_NICK,
+};
+
+extern int irc_upgrade_save ();
+extern int irc_upgrade_load ();
+
+#endif /* irc-upgrade.h */

src/plugins/irc/irc.c

@@ -31,6 +31,7 @@
 #include "irc-server.h"
 #include "irc-channel.h"
 #include "irc-nick.h"
+#include "irc-upgrade.h"
 
 
 WEECHAT_PLUGIN_NAME("irc");
@@ -45,6 +46,8 @@ struct t_weechat_plugin *weechat_irc_plugin = NULL;
 struct t_hook *irc_hook_timer = NULL;
 struct t_hook *irc_hook_timer_check_away = NULL;
 
+int irc_signal_upgrade_received = 0;   /* signal "upgrade" received ?       */
+
 
 /*
  * irc_signal_quit_cb: callback for "quit" signal
@@ -73,6 +76,25 @@ irc_signal_quit_cb (void *data, const char *signal, const char *type_data,
     return WEECHAT_RC_OK;
 }
 
+/*
+ * irc_signal_upgrade_cb: callback for "upgrade" signal
+ */
+
+int
+irc_signal_upgrade_cb (void *data, const char *signal, const char *type_data,
+                       void *signal_data)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) signal;
+    (void) type_data;
+    (void) signal_data;
+    
+    irc_signal_upgrade_received = 1;
+    
+    return WEECHAT_RC_OK;
+}
+
 /*
  * weechat_plugin_init: initialize IRC plugin
  */
@@ -80,7 +102,7 @@ irc_signal_quit_cb (void *data, const char *signal, const char *type_data,
 int
 weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
 {
-    int i, auto_connect;
+    int i, auto_connect, upgrading;
     
     weechat_plugin = plugin;
     
@@ -95,6 +117,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     /* hook some signals */
     irc_debug_init ();
     weechat_hook_signal ("quit", &irc_signal_quit_cb, NULL);
+    weechat_hook_signal ("upgrade", &irc_signal_upgrade_cb, NULL);
     weechat_hook_signal ("xfer_send_ready", &irc_server_xfer_send_ready_cb, NULL);
     weechat_hook_signal ("xfer_resume_ready", &irc_server_xfer_resume_ready_cb, NULL);
     weechat_hook_signal ("xfer_send_accept_resume", &irc_server_xfer_send_accept_resume_cb, NULL);
@@ -104,6 +127,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     
     /* look at arguments */
     auto_connect = 1;
+    upgrading = 0;
     for (i = 0; i < argc; i++)
     {
         if ((weechat_strcasecmp (argv[i], "-a") == 0)
@@ -122,9 +146,16 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
                                 argv[i]);
             }
         }
+        else if (weechat_strcasecmp (argv[i], "--upgrade") == 0)
+        {
+            upgrading = 1;
+        }
     }
-    
-    irc_server_auto_connect (auto_connect, 0);
+
+    if (upgrading)
+        irc_upgrade_load ();
+    else
+        irc_server_auto_connect (auto_connect, 0);
     
     irc_hook_timer = weechat_hook_timer (1 * 1000, 0, 0,
                                          &irc_server_timer_cb, NULL);
@@ -152,7 +183,11 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     
     irc_config_write ();
     
-    irc_server_disconnect_all ();
+    if (irc_signal_upgrade_received)
+        irc_upgrade_save ();
+    else
+        irc_server_disconnect_all ();
+    
     irc_server_free_all ();
     
     return WEECHAT_RC_OK;

src/plugins/logger/logger.c

@@ -69,6 +69,8 @@ char *logger_option_time_format = NULL;
 int logger_option_info_lines = 0;
 int logger_option_backlog = 0;
 
+char *logger_buf_write = NULL;         /* buffer for writing a line         */
+
 
 /*
  * logger_config_read: read config options for logger plugin
@@ -233,7 +235,7 @@ logger_create_directory ()
 char *
 logger_get_filename (struct t_gui_buffer *buffer)
 {
-    struct t_plugin_infolist *ptr_infolist;
+    struct t_infolist *ptr_infolist;
     char *res;
     char *dir_separator, *weechat_dir, *log_path, *log_path2;
     char *plugin_name, *plugin_name2, *category, *category2, *name, *name2;
@@ -326,10 +328,15 @@ logger_write_line (struct t_logger_buffer *logger_buffer,
                    const char *format, ...)
 {
     va_list argptr;
-    char *buf, *charset, *message;
+    char *charset, *message;
     time_t seconds;
     struct tm *date_tmp;
     char buf_time[256];
+
+    if (!logger_buf_write)
+        logger_buf_write = malloc (LOGGER_BUF_WRITE_SIZE);
+    if (!logger_buf_write)
+        return;
     
     if (logger_buffer->log_filename)
     {
@@ -347,7 +354,6 @@ logger_write_line (struct t_logger_buffer *logger_buffer,
                                 logger_buffer->log_filename);
                 free (logger_buffer->log_filename);
                 logger_buffer->log_filename = NULL;
-                free (buf);
                 return;
             }
             
@@ -359,36 +365,30 @@ logger_write_line (struct t_logger_buffer *logger_buffer,
                 if (date_tmp)
                     strftime (buf_time, sizeof (buf_time) - 1,
                               logger_option_time_format, date_tmp);
-                snprintf (buf, sizeof (buf) - 1,
+                snprintf (logger_buf_write, LOGGER_BUF_WRITE_SIZE,
                           _("%s\t****  Beginning of log  ****"),
                           buf_time);
                 message = (charset) ?
-                    weechat_iconv_from_internal (charset, buf) : NULL;
+                    weechat_iconv_from_internal (charset, logger_buf_write) : NULL;
                 fprintf (logger_buffer->log_file,
-                         "%s\n", (message) ? message : buf);
+                         "%s\n", (message) ? message : logger_buf_write);
                 if (message)
                     free (message);
             }
         }
 
-        buf = malloc (128 * 1024);
-        if (buf)
-        {
-            va_start (argptr, format);
-            vsnprintf (buf, 128 * 1024, format, argptr);
-            va_end (argptr);
-            
-            message = (charset) ?
-                weechat_iconv_from_internal (charset, buf) : NULL;
-            
-            fprintf (logger_buffer->log_file,
-                     "%s\n", (message) ? message : buf);
-            fflush (logger_buffer->log_file);
-            if (message)
-                free (message);
-            
-            free (buf);
-        }
+        va_start (argptr, format);
+        vsnprintf (logger_buf_write, LOGGER_BUF_WRITE_SIZE, format, argptr);
+        va_end (argptr);
+        
+        message = (charset) ?
+            weechat_iconv_from_internal (charset, logger_buf_write) : NULL;
+        
+        fprintf (logger_buffer->log_file,
+                 "%s\n", (message) ? message : logger_buf_write);
+        fflush (logger_buffer->log_file);
+        if (message)
+            free (message);
     }
 }
 
@@ -434,7 +434,7 @@ logger_start_buffer (struct t_gui_buffer *buffer)
 void
 logger_start_buffer_all ()
 {
-    struct t_plugin_infolist *ptr_infolist;
+    struct t_infolist *ptr_infolist;
     
     ptr_infolist = weechat_infolist_get ("buffer", NULL, NULL);
     if (ptr_infolist)
@@ -767,5 +767,8 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     if (logger_option_time_format)
         free (logger_option_time_format);
     
+    if (logger_buf_write)
+        free (logger_buf_write);
+    
     return WEECHAT_RC_OK;
 }

src/plugins/logger/logger.h

@@ -24,6 +24,8 @@
 
 #define weechat_plugin weechat_logger_plugin
 
+#define LOGGER_BUF_WRITE_SIZE  (16*1024)
+
 extern struct t_weechat_plugin *weechat_logger_plugin;
 
 extern void logger_start_buffer_all ();

src/plugins/notify/notify.c

@@ -209,7 +209,7 @@ notify_set_buffer (struct t_gui_buffer *buffer)
 void
 notify_set_buffer_all ()
 {
-    struct t_plugin_infolist *ptr_infolist;
+    struct t_infolist *ptr_infolist;
     
     ptr_infolist = weechat_infolist_get ("buffer", NULL, NULL);
     if (ptr_infolist)

src/plugins/plugin-api.c

@@ -34,6 +34,7 @@
 
 #include "../core/weechat.h"
 #include "../core/wee-config.h"
+#include "../core/wee-infolist.h"
 #include "../core/wee-input.h"
 #include "../core/wee-string.h"
 #include "../gui/gui-buffer.h"
@@ -45,7 +46,6 @@
 #include "../gui/gui-window.h"
 #include "plugin.h"
 #include "plugin-config.h"
-#include "plugin-infolist.h"
 
 
 /*
@@ -320,464 +320,16 @@ plugin_api_info_get (struct t_weechat_plugin *plugin, const char *info)
     return NULL;
 }
 
-/*
- * plugin_api_infolist_get_add_buffer: add a buffer in a list
- *                                     return 1 if ok, 0 if error
- */
-
-int
-plugin_api_infolist_get_add_buffer (struct t_plugin_infolist *infolist,
-                                    struct t_gui_buffer *buffer)
-{
-    struct t_plugin_infolist_item *ptr_item;
-    
-    if (!infolist || !buffer)
-        return 0;
-    
-    ptr_item = plugin_infolist_new_item (infolist);
-    if (!ptr_item)
-        return 0;
-
-    if (!plugin_infolist_new_var_pointer (ptr_item, "pointer", buffer))
-        return 0;
-    if (!plugin_infolist_new_var_pointer (ptr_item, "plugin", buffer->plugin))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "plugin_name",
-                                         (buffer->plugin) ?
-                                         buffer->plugin->name : NULL))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "number", buffer->number))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "category", buffer->category))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "name", buffer->name))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "type", buffer->type))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "notify", buffer->notify))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "num_displayed", buffer->num_displayed))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "lines_hidden", buffer->lines_hidden))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "title", buffer->title))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input", buffer->input))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "input_nick", buffer->input_nick))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "input_string", buffer->input_buffer))
-        return 0;
-    
-    return 1;
-}
-
-/*
- * plugin_api_infolist_get_add_buffer_line: add a buffer line in a list
- *                                          return 1 if ok, 0 if error
- */
-
-int
-plugin_api_infolist_get_add_buffer_line (struct t_plugin_infolist *infolist,
-                                         struct t_gui_line *line)
-{
-    struct t_plugin_infolist_item *ptr_item;
-    int i;
-    char option_name[64];
-    
-    if (!infolist || !line)
-        return 0;
-    
-    ptr_item = plugin_infolist_new_item (infolist);
-    if (!ptr_item)
-        return 0;
-    
-    if (!plugin_infolist_new_var_time (ptr_item, "date", line->date))
-        return 0;
-    if (!plugin_infolist_new_var_time (ptr_item, "date_printed", line->date))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "str_time", line->str_time))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "tags_count", line->tags_count))
-        return 0;
-    for (i = 0; i < line->tags_count; i++)
-    {
-        snprintf (option_name, sizeof (option_name), "tag_%05d", i + 1);
-        if (!plugin_infolist_new_var_string (ptr_item, option_name,
-                                             line->tags_array[i]))
-            return 0;
-    }
-    if (!plugin_infolist_new_var_integer (ptr_item, "displayed", line->displayed))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "highlight", line->highlight))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "prefix", line->prefix))
-        return 0;
-    if (!plugin_infolist_new_var_string (ptr_item, "message", line->message))
-        return 0;
-    
-    return 1;
-}
-
-/*
- * plugin_api_infolist_get_add_nicklist: add a nicklist
- *                                       return 1 if ok, 0 if error
- */
-
-int
-plugin_api_infolist_get_add_nicklist (struct t_plugin_infolist *infolist,
-                                      struct t_gui_buffer *buffer)
-{
-    struct t_plugin_infolist_item *ptr_item;
-    struct t_gui_nick_group *ptr_group;
-    struct t_gui_nick *ptr_nick;
-    char prefix[2];
-    
-    if (!infolist || !buffer)
-        return 0;
-    
-    ptr_group = NULL;
-    ptr_nick = NULL;
-    gui_nicklist_get_next_item (buffer, &ptr_group, &ptr_nick);
-    while (ptr_group || ptr_nick)
-    {
-        ptr_item = plugin_infolist_new_item (infolist);
-        if (!ptr_item)
-            return 0;
-        
-        if (ptr_nick)
-        {
-            if (!plugin_infolist_new_var_string (ptr_item, "type", "nick"))
-                return 0;
-            if (!plugin_infolist_new_var_string (ptr_item, "name", ptr_nick->name))
-                return 0;
-            if (!plugin_infolist_new_var_string (ptr_item, "color", ptr_nick->color))
-                return 0;
-            prefix[0] = ptr_nick->prefix;
-            prefix[1] = '\0';
-            if (!plugin_infolist_new_var_string (ptr_item, "prefix", prefix))
-                return 0;
-            if (!plugin_infolist_new_var_string (ptr_item, "prefix_color", ptr_nick->prefix_color))
-                return 0;
-            if (!plugin_infolist_new_var_integer (ptr_item, "visible", ptr_nick->visible))
-                return 0;
-        }
-        else
-        {
-            if (!plugin_infolist_new_var_string (ptr_item, "type", "group"))
-                return 0;
-            if (!plugin_infolist_new_var_string (ptr_item, "name", ptr_group->name))
-                return 0;
-            if (!plugin_infolist_new_var_string (ptr_item, "color", ptr_group->color))
-                return 0;
-            if (!plugin_infolist_new_var_integer (ptr_item, "visible", ptr_group->visible))
-                return 0;
-            if (!plugin_infolist_new_var_integer (ptr_item, "level", ptr_group->level))
-                return 0;
-        }
-        gui_nicklist_get_next_item (buffer, &ptr_group, &ptr_nick);
-    }
-    
-    return 1;
-}
-
-/*
- * plugin_api_infolist_get_add_window: add a window in a list
- *                                     return 1 if ok, 0 if error
- */
-
-int
-plugin_api_infolist_get_add_window (struct t_plugin_infolist *infolist,
-                                    struct t_gui_window *window)
-{
-    struct t_plugin_infolist_item *ptr_item;
-    
-    if (!infolist || !window)
-        return 0;
-    
-    ptr_item = plugin_infolist_new_item (infolist);
-    if (!ptr_item)
-        return 0;
-    
-    if (!plugin_infolist_new_var_pointer (ptr_item, "pointer", window))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "x", window->win_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "y", window->win_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "width", window->win_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "height", window->win_height))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "width_pct", window->win_width_pct))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "height_pct", window->win_height_pct))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "chat_x", window->win_chat_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "chat_y", window->win_chat_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "chat_width", window->win_chat_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "chat_height", window->win_chat_height))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "nick_x", window->win_nick_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "nick_y", window->win_nick_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "nick_width", window->win_nick_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "nick_height", window->win_nick_height))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "nick_start", window->win_nick_start))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "title_x", window->win_title_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "title_y", window->win_title_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "title_width", window->win_title_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "title_start", window->win_title_start))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "status_x", window->win_status_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "status_y", window->win_status_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "status_width", window->win_status_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "status_height", window->win_status_height))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input_x", window->win_input_x))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input_y", window->win_input_y))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input_width", window->win_input_width))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input_height", window->win_input_height))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "input_cursor_x", window->win_input_cursor_x))
-        return 0;
-    if (!plugin_infolist_new_var_pointer (ptr_item, "buffer", window->buffer))
-        return 0;
-    if (!plugin_infolist_new_var_integer (ptr_item, "start_line_y",
-                                          ((window->buffer->type == GUI_BUFFER_TYPE_FREE)
-                                           && (window->start_line)) ?
-                                          window->start_line->y : 0))
-        return 0;
-    
-    return 1;
-}
-
-/*
- * plugin_api_infolist_get_add_options: add config options in a list
- *                                          return 1 if ok, 0 if error
- */
-
-int
-plugin_api_infolist_get_add_options (struct t_plugin_infolist *infolist,
-                                     const char *option_name)
-{
-    struct t_config_file *ptr_config;
-    struct t_config_section *ptr_section;
-    struct t_config_option *ptr_option;
-    struct t_plugin_infolist_item *ptr_item;
-    int length;
-    char *option_full_name, value[128];
-    
-    if (!infolist)
-        return 0;
-    
-    for (ptr_config = config_files; ptr_config;
-         ptr_config = ptr_config->next_config)
-    {
-        for (ptr_section = ptr_config->sections; ptr_section;
-             ptr_section = ptr_section->next_section)
-        {
-            for (ptr_option = ptr_section->options; ptr_option;
-                 ptr_option = ptr_option->next_option)
-            {
-                length = strlen (ptr_config->name) + 1 +
-                    strlen (ptr_section->name) + 1 +
-                    strlen (ptr_option->name) + 1;
-                option_full_name = malloc (length);
-                if (option_full_name)
-                {
-                    snprintf (option_full_name, length, "%s.%s.%s",
-                              ptr_config->name,
-                              ptr_section->name,
-                              ptr_option->name);
-                    if (!option_name || !option_name[0]
-                        || string_match (option_full_name, option_name, 0))
-                    {
-                        ptr_item = plugin_infolist_new_item (infolist);
-                        if (!ptr_item)
-                        {
-                            free (option_full_name);
-                            return 0;
-                        }
-                        if (!plugin_infolist_new_var_string (ptr_item,
-                                                             "full_name",
-                                                             option_full_name))
-                        {
-                            free (option_full_name);
-                            return 0;
-                        }
-                        if (!plugin_infolist_new_var_string (ptr_item,
-                                                             "name",
-                                                             ptr_option->name))
-                        {
-                            free (option_full_name);
-                            return 0;
-                        }
-                        switch (ptr_option->type)
-                        {
-                            case CONFIG_OPTION_TYPE_BOOLEAN:
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "type",
-                                                                     "boolean"))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (CONFIG_BOOLEAN(ptr_option) == CONFIG_BOOLEAN_TRUE)
-                                    snprintf (value, sizeof (value), "on");
-                                else
-                                    snprintf (value, sizeof (value), "off");
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "value",
-                                                                     value))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (CONFIG_BOOLEAN_DEFAULT(ptr_option) == CONFIG_BOOLEAN_TRUE)
-                                    snprintf (value, sizeof (value), "on");
-                                else
-                                    snprintf (value, sizeof (value), "off");
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "default_value",
-                                                                     value))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                break;
-                            case CONFIG_OPTION_TYPE_INTEGER:
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "type",
-                                                                     "integer"))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (ptr_option->string_values)
-                                {
-                                    if (!plugin_infolist_new_var_string (ptr_item,
-                                                                         "value",
-                                                                         ptr_option->string_values[CONFIG_INTEGER(ptr_option)]))
-                                    {
-                                        free (option_full_name);
-                                        return 0;
-                                    }
-                                    if (!plugin_infolist_new_var_string (ptr_item,
-                                                                         "default_value",
-                                                                         ptr_option->string_values[CONFIG_INTEGER_DEFAULT(ptr_option)]))
-                                    {
-                                        free (option_full_name);
-                                        return 0;
-                                    }
-                                }
-                                else
-                                {
-                                    snprintf (value, sizeof (value), "%d",
-                                              CONFIG_INTEGER(ptr_option));
-                                    if (!plugin_infolist_new_var_string (ptr_item,
-                                                                         "value",
-                                                                         value))
-                                    {
-                                        free (option_full_name);
-                                        return 0;
-                                    }
-                                    snprintf (value, sizeof (value), "%d",
-                                              CONFIG_INTEGER_DEFAULT(ptr_option));
-                                    if (!plugin_infolist_new_var_string (ptr_item,
-                                                                         "default_value",
-                                                                         value))
-                                    {
-                                        free (option_full_name);
-                                        return 0;
-                                    }
-                                }
-                                break;
-                            case CONFIG_OPTION_TYPE_STRING:
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "type",
-                                                                     "string"))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "value",
-                                                                     CONFIG_STRING(ptr_option)))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "default_value",
-                                                                     CONFIG_STRING_DEFAULT(ptr_option)))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                break;
-                            case CONFIG_OPTION_TYPE_COLOR:
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "type",
-                                                                     "color"))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "value",
-                                                                     gui_color_get_name (CONFIG_COLOR(ptr_option))))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                if (!plugin_infolist_new_var_string (ptr_item,
-                                                                     "default_value",
-                                                                     gui_color_get_name (CONFIG_COLOR_DEFAULT(ptr_option))))
-                                {
-                                    free (option_full_name);
-                                    return 0;
-                                }
-                                break;
-                            case CONFIG_NUM_OPTION_TYPES:
-                                break;
-                        }
-                    }
-                    free (option_full_name);
-                }
-            }
-        }
-    }
-    
-    return 1;
-}
-
 /*
  * plugin_api_infolist_get: get list with infos about WeeChat structures
  *                          WARNING: caller has to free string returned
  *                          by this function after use, with weechat_infolist_free()
  */
 
-struct t_plugin_infolist *
+struct t_infolist *
 plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
 {
-    struct t_plugin_infolist *ptr_infolist;
+    struct t_infolist *ptr_infolist;
     struct t_gui_buffer *ptr_buffer;
     struct t_gui_line *ptr_line;
     struct t_gui_window *ptr_window;
@@ -791,15 +343,15 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
         if (pointer && (!gui_buffer_valid (pointer)))
             return NULL;
         
-        ptr_infolist = plugin_infolist_new ();
+        ptr_infolist = infolist_new ();
         if (ptr_infolist)
         {
             if (pointer)
             {
                 /* build list with only one buffer */
-                if (!plugin_api_infolist_get_add_buffer (ptr_infolist, pointer))
+                if (!gui_buffer_add_to_infolist (ptr_infolist, pointer))
                 {
-                    plugin_infolist_free (ptr_infolist);
+                    infolist_free (ptr_infolist);
                     return NULL;
                 }
                 return ptr_infolist;
@@ -810,10 +362,9 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
                 for (ptr_buffer = gui_buffers; ptr_buffer;
                      ptr_buffer = ptr_buffer->next_buffer)
                 {
-                    if (!plugin_api_infolist_get_add_buffer (ptr_infolist,
-                                                             ptr_buffer))
+                    if (!gui_buffer_add_to_infolist (ptr_infolist, ptr_buffer))
                     {
-                        plugin_infolist_free (ptr_infolist);
+                        infolist_free (ptr_infolist);
                         return NULL;
                     }
                 }
@@ -832,16 +383,15 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
                 return NULL;
         }
         
-        ptr_infolist = plugin_infolist_new ();
+        ptr_infolist = infolist_new ();
         if (ptr_infolist)
         {
             for (ptr_line = ((struct t_gui_buffer *)pointer)->lines; ptr_line;
                  ptr_line = ptr_line->next_line)
             {
-                if (!plugin_api_infolist_get_add_buffer_line (ptr_infolist,
-                                                              ptr_line))
+                if (!gui_buffer_line_add_to_infolist (ptr_infolist, ptr_line))
                 {
-                    plugin_infolist_free (ptr_infolist);
+                    infolist_free (ptr_infolist);
                     return NULL;
                 }
             }
@@ -854,12 +404,12 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
         if (!pointer || (!gui_buffer_valid (pointer)))
             return NULL;
         
-        ptr_infolist = plugin_infolist_new ();
+        ptr_infolist = infolist_new ();
         if (ptr_infolist)
         {
-            if (!plugin_api_infolist_get_add_nicklist (ptr_infolist, pointer))
+            if (!gui_nicklist_add_to_infolist (ptr_infolist, pointer))
             {
-                plugin_infolist_free (ptr_infolist);
+                infolist_free (ptr_infolist);
                 return NULL;
             }
             return ptr_infolist;
@@ -871,15 +421,15 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
         if (pointer && (!gui_window_valid (pointer)))
             return NULL;
         
-        ptr_infolist = plugin_infolist_new ();
+        ptr_infolist = infolist_new ();
         if (ptr_infolist)
         {
             if (pointer)
             {
                 /* build list with only one window */
-                if (!plugin_api_infolist_get_add_window (ptr_infolist, pointer))
+                if (!gui_window_add_to_infolist (ptr_infolist, pointer))
                 {
-                    plugin_infolist_free (ptr_infolist);
+                    infolist_free (ptr_infolist);
                     return NULL;
                 }
                 return ptr_infolist;
@@ -891,10 +441,10 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
                     if ((string_strcasecmp (arguments, "current") == 0)
                         && gui_current_window)
                     {
-                        if (!plugin_api_infolist_get_add_window (ptr_infolist,
-                                                                 gui_current_window))
+                        if (!gui_window_add_to_infolist (ptr_infolist,
+                                                         gui_current_window))
                         {
-                            plugin_infolist_free (ptr_infolist);
+                            infolist_free (ptr_infolist);
                             return NULL;
                         }
                         return ptr_infolist;
@@ -907,10 +457,10 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
                     for (ptr_window = gui_windows; ptr_window;
                          ptr_window = ptr_window->next_window)
                     {
-                        if (!plugin_api_infolist_get_add_window (ptr_infolist,
-                                                                 ptr_window))
+                        if (!gui_window_add_to_infolist (ptr_infolist,
+                                                         ptr_window))
                         {
-                            plugin_infolist_free (ptr_infolist);
+                            infolist_free (ptr_infolist);
                             return NULL;
                         }
                     }
@@ -921,12 +471,12 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
     }
     else if (string_strcasecmp (name, "options") == 0)
     {
-        ptr_infolist = plugin_infolist_new ();
+        ptr_infolist = infolist_new ();
         if (ptr_infolist)
         {
-            if (!plugin_api_infolist_get_add_options (ptr_infolist, arguments))
+            if (!config_file_add_to_infolist (ptr_infolist, arguments))
             {
-                plugin_infolist_free (ptr_infolist);
+                infolist_free (ptr_infolist);
                 return NULL;
             }
             return ptr_infolist;
@@ -944,12 +494,12 @@ plugin_api_infolist_get (const char *name, void *pointer, const char *arguments)
  */
 
 int
-plugin_api_infolist_next (struct t_plugin_infolist *infolist)
+plugin_api_infolist_next (struct t_infolist *infolist)
 {
-    if (!infolist || !plugin_infolist_valid (infolist))
+    if (!infolist || !infolist_valid (infolist))
         return 0;
     
-    return (plugin_infolist_next_item (infolist)) ? 1 : 0;
+    return (infolist_next (infolist)) ? 1 : 0;
 }
 
 /*
@@ -959,12 +509,25 @@ plugin_api_infolist_next (struct t_plugin_infolist *infolist)
  */
 
 int
-plugin_api_infolist_prev (struct t_plugin_infolist *infolist)
+plugin_api_infolist_prev (struct t_infolist *infolist)
 {
-    if (!infolist || !plugin_infolist_valid (infolist))
+    if (!infolist || !infolist_valid (infolist))
         return 0;
 
-    return (plugin_infolist_prev_item (infolist)) ? 1 : 0;
+    return (infolist_prev (infolist)) ? 1 : 0;
+}
+
+/*
+ * plugin_api_infolist_reset_item_cursor: reset item cursor in infolist
+ */
+
+void
+plugin_api_infolist_reset_item_cursor (struct t_infolist *infolist)
+{
+    if (infolist && infolist_valid (infolist))
+    {
+        infolist_reset_item_cursor (infolist);
+    }
 }
 
 /*
@@ -972,12 +535,12 @@ plugin_api_infolist_prev (struct t_plugin_infolist *infolist)
  */
 
 char *
-plugin_api_infolist_fields (struct t_plugin_infolist *infolist)
+plugin_api_infolist_fields (struct t_infolist *infolist)
 {
-    if (!infolist || !plugin_infolist_valid (infolist))
+    if (!infolist || !infolist_valid (infolist))
         return NULL;
     
-    return plugin_infolist_get_fields (infolist);
+    return infolist_fields (infolist);
 }
 
 /*
@@ -985,13 +548,12 @@ plugin_api_infolist_fields (struct t_plugin_infolist *infolist)
  */
 
 int
-plugin_api_infolist_integer (struct t_plugin_infolist *infolist, const char *var)
+plugin_api_infolist_integer (struct t_infolist *infolist, const char *var)
 {
-    if (!infolist || !plugin_infolist_valid (infolist)
-        || !((struct t_plugin_infolist *)infolist)->ptr_item)
+    if (!infolist || !infolist_valid (infolist) || !infolist->ptr_item)
         return 0;
     
-    return plugin_infolist_get_integer (infolist, var);
+    return infolist_integer (infolist, var);
 }
 
 /*
@@ -999,13 +561,12 @@ plugin_api_infolist_integer (struct t_plugin_infolist *infolist, const char *var
  */
 
 char *
-plugin_api_infolist_string (struct t_plugin_infolist *infolist, const char *var)
+plugin_api_infolist_string (struct t_infolist *infolist, const char *var)
 {
-    if (!infolist || !plugin_infolist_valid (infolist)
-        || !((struct t_plugin_infolist *)infolist)->ptr_item)
+    if (!infolist || !infolist_valid (infolist) || !infolist->ptr_item)
         return NULL;
     
-    return plugin_infolist_get_string (infolist, var);
+    return infolist_string (infolist, var);
 }
 
 /*
@@ -1013,13 +574,26 @@ plugin_api_infolist_string (struct t_plugin_infolist *infolist, const char *var)
  */
 
 void *
-plugin_api_infolist_pointer (struct t_plugin_infolist *infolist, const char *var)
+plugin_api_infolist_pointer (struct t_infolist *infolist, const char *var)
 {
-    if (!infolist || !plugin_infolist_valid (infolist)
-        || !((struct t_plugin_infolist *)infolist)->ptr_item)
+    if (!infolist || !infolist_valid (infolist) || !infolist->ptr_item)
         return NULL;
     
-    return plugin_infolist_get_pointer (infolist, var);
+    return infolist_pointer (infolist, var);
+}
+
+/*
+ * plugin_api_infolist_buffer: get a buffer variable value in current list item
+ */
+
+void *
+plugin_api_infolist_buffer (struct t_infolist *infolist, const char *var,
+                            int *size)
+{
+    if (!infolist || !infolist_valid (infolist) || !infolist->ptr_item)
+        return NULL;
+    
+    return infolist_buffer (infolist, var, size);
 }
 
 /*
@@ -1027,13 +601,12 @@ plugin_api_infolist_pointer (struct t_plugin_infolist *infolist, const char *var
  */
 
 time_t
-plugin_api_infolist_time (struct t_plugin_infolist *infolist, const char *var)
+plugin_api_infolist_time (struct t_infolist *infolist, const char *var)
 {
-    if (!infolist || !plugin_infolist_valid (infolist)
-        || !((struct t_plugin_infolist *)infolist)->ptr_item)
+    if (!infolist || !infolist_valid (infolist) || !infolist->ptr_item)
         return 0;
     
-    return plugin_infolist_get_time (infolist, var);
+    return infolist_time (infolist, var);
 }
 
 /*
@@ -1041,8 +614,8 @@ plugin_api_infolist_time (struct t_plugin_infolist *infolist, const char *var)
  */
 
 void
-plugin_api_infolist_free (struct t_plugin_infolist *infolist)
+plugin_api_infolist_free (struct t_infolist *infolist)
 {
-    if (infolist && plugin_infolist_valid (infolist))
-        plugin_infolist_free (infolist);
+    if (infolist && infolist_valid (infolist))
+        infolist_free (infolist);
 }

src/plugins/plugin-api.h

@@ -50,20 +50,23 @@ extern void plugin_api_command (struct t_weechat_plugin *plugin,
 extern char *plugin_api_info_get (struct t_weechat_plugin *plugin, const char *info);
 
 /* infolists */
-extern struct t_plugin_infolist *plugin_api_infolist_get (const char *name,
-                                                          void *pointer,
-                                                          const char *arguments);
-extern int plugin_api_infolist_next (struct t_plugin_infolist *infolist);
-extern int plugin_api_infolist_prev (struct t_plugin_infolist *infolist);
-extern char *plugin_api_infolist_fields (struct t_plugin_infolist *infolist);
-extern int plugin_api_infolist_integer (struct t_plugin_infolist *infolist,
+extern struct t_infolist *plugin_api_infolist_get (const char *name,
+                                                   void *pointer,
+                                                   const char *arguments);
+extern int plugin_api_infolist_next (struct t_infolist *infolist);
+extern int plugin_api_infolist_prev (struct t_infolist *infolist);
+extern void plugin_api_infolist_reset_item_cursor (struct t_infolist *infolist);
+extern char *plugin_api_infolist_fields (struct t_infolist *infolist);
+extern int plugin_api_infolist_integer (struct t_infolist *infolist,
                                         const char *var);
-extern char *plugin_api_infolist_string (struct t_plugin_infolist *infolist,
+extern char *plugin_api_infolist_string (struct t_infolist *infolist,
                                          const char *var);
-extern void *plugin_api_infolist_pointer (struct t_plugin_infolist *infolist,
+extern void *plugin_api_infolist_pointer (struct t_infolist *infolist,
                                           const char *var);
-extern time_t plugin_api_infolist_time (struct t_plugin_infolist *infolist,
+extern void *plugin_api_infolist_buffer (struct t_infolist *infolist,
+                                         const char *var, int *size);
+extern time_t plugin_api_infolist_time (struct t_infolist *infolist,
                                         const char *var);
-extern void plugin_api_infolist_free (struct t_plugin_infolist *infolist);
+extern void plugin_api_infolist_free (struct t_infolist *infolist);
 
 #endif /* plugin-api.h */

src/plugins/plugin-infolist.c

@@ -1,616 +0,0 @@
-/*
- * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
- * See README for License detail, AUTHORS for developers list.
- *
- * This program 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.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* plugin-infolist.c: manages plugin info lists */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "../core/weechat.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "plugin-infolist.h"
-
-
-struct t_plugin_infolist *plugin_infolists = NULL;
-struct t_plugin_infolist *last_plugin_infolist = NULL;
-
-
-/*
- * plugin_list_new: create a new plugin list
- */
-
-struct t_plugin_infolist *
-plugin_infolist_new ()
-{
-    struct t_plugin_infolist *new_infolist;
-
-    new_infolist = malloc (sizeof (*new_infolist));
-    if (new_infolist)
-    {
-        new_infolist->items = NULL;
-        new_infolist->last_item = NULL;
-        new_infolist->ptr_item = NULL;
-        
-        new_infolist->prev_infolist = last_plugin_infolist;
-        new_infolist->next_infolist = NULL;
-        if (plugin_infolists)
-            last_plugin_infolist->next_infolist = new_infolist;
-        else
-            plugin_infolists = new_infolist;
-        last_plugin_infolist = new_infolist;
-    }
-    
-    return new_infolist;
-}
-
-/*
- * plugin_infolist_new_item: create a new item in a plugin list
- */
-
-struct t_plugin_infolist_item *
-plugin_infolist_new_item (struct t_plugin_infolist *list)
-{
-    struct t_plugin_infolist_item *new_item;
-
-    new_item = malloc (sizeof (*new_item));
-    if (new_item)
-    {
-        new_item->vars = NULL;
-        new_item->last_var = NULL;
-        new_item->fields = NULL;
-        
-        new_item->prev_item = list->last_item;
-        new_item->next_item = NULL;
-        if (list->items)
-            list->last_item->next_item = new_item;
-        else
-            list->items = new_item;
-        list->last_item = new_item;
-    }
-    
-    return new_item;
-}
-
-/*
- * plugin_infolist_new_var_integer: create a new integer variable in an item
- */
-
-struct t_plugin_infolist_var *
-plugin_infolist_new_var_integer (struct t_plugin_infolist_item *item,
-                                 const char *name, int value)
-{
-    struct t_plugin_infolist_var *new_var;
-    
-    if (!item || !name || !name[0])
-        return NULL;
-    
-    new_var = malloc (sizeof (*new_var));
-    if (new_var)
-    {
-        new_var->name = strdup (name);
-        new_var->type = PLUGIN_INFOLIST_INTEGER;
-        new_var->value = malloc (sizeof (int));
-        if (new_var->value)
-            *((int *)new_var->value) = value;
-        
-        new_var->prev_var = item->last_var;
-        new_var->next_var = NULL;
-        if (item->vars)
-            item->last_var->next_var = new_var;
-        else
-            item->vars = new_var;
-        item->last_var = new_var;
-    }
-    
-    return new_var;
-}
-
-/*
- * plugin_infolist_new_var_string: create a new string variable in an item
- */
-
-struct t_plugin_infolist_var *
-plugin_infolist_new_var_string (struct t_plugin_infolist_item *item,
-                                const char *name, const char *value)
-{
-    struct t_plugin_infolist_var *new_var;
-    
-    if (!item || !name || !name[0])
-        return NULL;
-    
-    new_var = malloc (sizeof (*new_var));
-    if (new_var)
-    {
-        new_var->name = strdup (name);
-        new_var->type = PLUGIN_INFOLIST_STRING;
-        new_var->value = (value) ? strdup (value) : NULL;
-        
-        new_var->prev_var = item->last_var;
-        new_var->next_var = NULL;
-        if (item->vars)
-            item->last_var->next_var = new_var;
-        else
-            item->vars = new_var;
-        item->last_var = new_var;
-    }
-    
-    return new_var;
-}
-
-/*
- * plugin_infolist_new_var_pointer: create a new pointer variable in an item
- */
-
-struct t_plugin_infolist_var *
-plugin_infolist_new_var_pointer (struct t_plugin_infolist_item *item,
-                                 const char *name, void *pointer)
-{
-    struct t_plugin_infolist_var *new_var;
-    
-    if (!item || !name || !name[0])
-        return NULL;
-    
-    new_var = malloc (sizeof (*new_var));
-    if (new_var)
-    {
-        new_var->name = strdup (name);
-        new_var->type = PLUGIN_INFOLIST_POINTER;
-        new_var->value = pointer;
-        
-        new_var->prev_var = item->last_var;
-        new_var->next_var = NULL;
-        if (item->vars)
-            item->last_var->next_var = new_var;
-        else
-            item->vars = new_var;
-        item->last_var = new_var;
-    }
-    
-    return new_var;
-}
-
-/*
- * plugin_infolist_new_var_time: create a new time variable in an item
- */
-
-struct t_plugin_infolist_var *
-plugin_infolist_new_var_time (struct t_plugin_infolist_item *item,
-                              const char *name, time_t time)
-{
-    struct t_plugin_infolist_var *new_var;
-    
-    if (!item || !name || !name[0])
-        return NULL;
-    
-    new_var = malloc (sizeof (*new_var));
-    if (new_var)
-    {
-        new_var->name = strdup (name);
-        new_var->type = PLUGIN_INFOLIST_TIME;
-        new_var->value = malloc (sizeof (time_t));
-        if (new_var->value)
-            *((time_t *)new_var->value) = time;
-        
-        new_var->prev_var = item->last_var;
-        new_var->next_var = NULL;
-        if (item->vars)
-            item->last_var->next_var = new_var;
-        else
-            item->vars = new_var;
-        item->last_var = new_var;
-    }
-    
-    return new_var;
-}
-
-/*
- * plugin_infolist_valid: check if a list pointer exists
- *                        return 1 if list exists
- *                               0 if list is not found
- */
-
-int
-plugin_infolist_valid (struct t_plugin_infolist *list)
-{
-    struct t_plugin_infolist *ptr_infolist;
-    
-    for (ptr_infolist = plugin_infolists; ptr_infolist;
-         ptr_infolist = ptr_infolist->next_infolist)
-    {
-        if (ptr_infolist == list)
-            return 1;
-    }
-    
-    /* list not found */
-    return 0;
-}
-
-/*
- * plugin_infolist_next_item: return next item for a list
- *                            if current item pointer is NULL,
- *                            then return first item of list
- */
-
-struct t_plugin_infolist_item *
-plugin_infolist_next_item (struct t_plugin_infolist *list)
-{
-    if (!list->ptr_item)
-    {
-        list->ptr_item = list->items;
-        return list->ptr_item;
-    }
-    list->ptr_item = list->ptr_item->next_item;
-    return list->ptr_item;
-}
-
-/*
- * plugin_infolist_prev_item: return previous item for a list
- *                            if current item pointer is NULL,
- *                            then return last item of list
- */
-
-struct t_plugin_infolist_item *
-plugin_infolist_prev_item (struct t_plugin_infolist *list)
-{
-    if (!list->ptr_item)
-    {
-        list->ptr_item = list->last_item;
-        return list->ptr_item;
-    }
-    list->ptr_item = list->ptr_item->prev_item;
-    return list->ptr_item;
-}
-
-/*
- * plugin_infolist_get_fields: get list of fields for current list item
- */
-
-char *
-plugin_infolist_get_fields (struct t_plugin_infolist *list)
-{
-    struct t_plugin_infolist_var *ptr_var;
-    int length;
-    
-    if (!list || !list->ptr_item)
-        return NULL;
-
-    /* list of fields already asked ? if yes, just return string */
-    if (list->ptr_item->fields)
-        return list->ptr_item->fields;
-    
-    length = 0;
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        length += strlen (ptr_var->name) + 3;
-    }
-    
-    list->ptr_item->fields = malloc (length + 1);
-    if (!list->ptr_item->fields)
-        return NULL;
-    
-    list->ptr_item->fields[0] = '\0';
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        switch (ptr_var->type)
-        {
-            case PLUGIN_INFOLIST_INTEGER:
-                strcat (list->ptr_item->fields, "i:");
-                break;
-            case PLUGIN_INFOLIST_STRING:
-                strcat (list->ptr_item->fields, "s:");
-                break;
-            case PLUGIN_INFOLIST_POINTER:
-                strcat (list->ptr_item->fields, "p:");
-                break;
-            case PLUGIN_INFOLIST_TIME:
-                strcat (list->ptr_item->fields, "t:");
-                break;
-        }
-        strcat (list->ptr_item->fields, ptr_var->name);
-        if (ptr_var->next_var)
-            strcat (list->ptr_item->fields, ",");
-    }
-    
-    return list->ptr_item->fields;
-}
-
-/*
- * plugin_infolist_get_integer: get an integer variable value in current list item
- */
-
-int
-plugin_infolist_get_integer (struct t_plugin_infolist *list, const char *var)
-{
-    struct t_plugin_infolist_var *ptr_var;
-    
-    if (!list || !list->ptr_item || !var || !var[0])
-        return 0;
-    
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        if (string_strcasecmp (ptr_var->name, var) == 0)
-        {
-            if (ptr_var->type == PLUGIN_INFOLIST_INTEGER)
-                return *((int *)ptr_var->value);
-            else
-                return 0;
-        }
-    }
-    
-    /* variable not found */
-    return 0;
-}
-
-/*
- * plugin_infolist_get_string: get a string variable value in current list item
- */
-
-char *
-plugin_infolist_get_string (struct t_plugin_infolist *list, const char *var)
-{
-    struct t_plugin_infolist_var *ptr_var;
-    
-    if (!list || !list->ptr_item || !var || !var[0])
-        return NULL;
-    
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        if (string_strcasecmp (ptr_var->name, var) == 0)
-        {
-            if (ptr_var->type == PLUGIN_INFOLIST_STRING)
-                return (char *)ptr_var->value;
-            else
-                return NULL;
-        }
-    }
-    
-    /* variable not found */
-    return NULL;
-}
-
-/*
- * plugin_infolist_get_pointer: get a pointer variable value in current list item
- */
-
-void *
-plugin_infolist_get_pointer (struct t_plugin_infolist *list, const char *var)
-{
-    struct t_plugin_infolist_var *ptr_var;
-    
-    if (!list || !list->ptr_item || !var || !var[0])
-        return NULL;
-    
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        if (string_strcasecmp (ptr_var->name, var) == 0)
-        {
-            if (ptr_var->type == PLUGIN_INFOLIST_POINTER)
-                return ptr_var->value;
-            else
-                return NULL;
-        }
-    }
-    
-    /* variable not found */
-    return NULL;
-}
-
-/*
- * plugin_infolist_get_time: get a time variable value in current list item
- */
-
-time_t
-plugin_infolist_get_time (struct t_plugin_infolist *list, const char *var)
-{
-    struct t_plugin_infolist_var *ptr_var;
-    
-    if (!list || !list->ptr_item || !var || !var[0])
-        return 0;
-    
-    for (ptr_var = list->ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var)
-    {
-        if (string_strcasecmp (ptr_var->name, var) == 0)
-        {
-            if (ptr_var->type == PLUGIN_INFOLIST_TIME)
-                return *((time_t *)ptr_var->value);
-            else
-                return 0;
-        }
-    }
-    
-    /* variable not found */
-    return 0;
-}
-
-/*
- * plugin_infolist_var_free: free a plugin list variable
- */
-
-void
-plugin_infolist_var_free (struct t_plugin_infolist_item *item,
-                          struct t_plugin_infolist_var *var)
-{
-    struct t_plugin_infolist_var *new_vars;
-    
-    /* remove var */
-    if (item->last_var == var)
-        item->last_var = var->prev_var;
-    if (var->prev_var)
-    {
-        (var->prev_var)->next_var = var->next_var;
-        new_vars = item->vars;
-    }
-    else
-        new_vars = var->next_var;
-    
-    if (var->next_var)
-        (var->next_var)->prev_var = var->prev_var;
-    
-    /* free data */
-    if (var->name)
-        free (var->name);
-    if (((var->type == PLUGIN_INFOLIST_INTEGER)
-         || (var->type == PLUGIN_INFOLIST_STRING)
-         || (var->type == PLUGIN_INFOLIST_TIME))
-        && var->value)
-    {
-        free (var->value);
-    }
-    
-    free (var);
-    
-    item->vars = new_vars;
-}
-
-/*
- * plugin_infolist_item_free: free a plugin list item
- */
-
-void
-plugin_infolist_item_free (struct t_plugin_infolist *list,
-                           struct t_plugin_infolist_item *item)
-{
-    struct t_plugin_infolist_item *new_items;
-    
-    /* remove var */
-    if (list->last_item == item)
-        list->last_item = item->prev_item;
-    if (item->prev_item)
-    {
-        (item->prev_item)->next_item = item->next_item;
-        new_items = list->items;
-    }
-    else
-        new_items = item->next_item;
-    
-    if (item->next_item)
-        (item->next_item)->prev_item = item->prev_item;
-    
-    /* free data */
-    while (item->vars)
-    {
-        plugin_infolist_var_free (item, item->vars);
-    }
-    if (item->fields)
-        free (item->fields);
-    
-    free (item);
-    
-    list->items = new_items;
-}
-
-/*
- * plugin_infolist_free: free a plugin list
- */
-
-void
-plugin_infolist_free (struct t_plugin_infolist *list)
-{
-    struct t_plugin_infolist *new_plugin_infolists;
-    
-    /* remove list */
-    if (last_plugin_infolist == list)
-        last_plugin_infolist = list->prev_infolist;
-    if (list->prev_infolist)
-    {
-        (list->prev_infolist)->next_infolist = list->next_infolist;
-        new_plugin_infolists = plugin_infolists;
-    }
-    else
-        new_plugin_infolists = list->next_infolist;
-    
-    if (list->next_infolist)
-        (list->next_infolist)->prev_infolist = list->prev_infolist;
-    
-    /* free data */
-    while (list->items)
-    {
-        plugin_infolist_item_free (list, list->items);
-    }
-    
-    free (list);
-    
-    plugin_infolists = new_plugin_infolists;
-}
-
-/*
- * plugin_infolist_print_log: print plugin lists infos in log (usually for crash dump)
- */
-
-void
-plugin_infolist_print_log ()
-{
-    struct t_plugin_infolist *ptr_infolist;
-    struct t_plugin_infolist_item *ptr_item;
-    struct t_plugin_infolist_var *ptr_var;
-    
-    for (ptr_infolist = plugin_infolists; ptr_infolist;
-         ptr_infolist = ptr_infolist->next_infolist)
-    {
-        log_printf ("");
-        log_printf ("[plugin infolist (addr:0x%x)]", ptr_infolist);
-        log_printf ("  items. . . . . . . . . : 0x%x", ptr_infolist->items);
-        log_printf ("  last_item. . . . . . . : 0x%x", ptr_infolist->last_item);
-        log_printf ("  ptr_item . . . . . . . : 0x%x", ptr_infolist->ptr_item);
-        log_printf ("  prev_infolist. . . . . : 0x%x", ptr_infolist->prev_infolist);
-        log_printf ("  next_infolist. . . . . : 0x%x", ptr_infolist->next_infolist);
-        
-        for (ptr_item = ptr_infolist->items; ptr_item;
-             ptr_item = ptr_item->next_item)
-        {
-            log_printf ("");
-            log_printf ("    [item (addr:0x%x)]", ptr_item);
-            log_printf ("      vars . . . . . . . . . : 0x%x", ptr_item->vars);
-            log_printf ("      last_var . . . . . . . : 0x%x", ptr_item->last_var);
-            log_printf ("      prev_item. . . . . . . : 0x%x", ptr_item->prev_item);
-            log_printf ("      next_item. . . . . . . : 0x%x", ptr_item->next_item);
-            
-            for (ptr_var = ptr_item->vars; ptr_var;
-                 ptr_var = ptr_var->next_var)
-            {
-                log_printf ("");
-                log_printf ("      [var (addr:0x%x)]", ptr_var);
-                log_printf ("        name . . . . . . . . : '%s'", ptr_var->name);
-                log_printf ("        type . . . . . . . . : %d",   ptr_var->type);
-                switch (ptr_var->type)
-                {
-                    case PLUGIN_INFOLIST_INTEGER:
-                        log_printf ("        value (integer). . . : %d", *((int *)ptr_var->value));
-                        break;
-                    case PLUGIN_INFOLIST_STRING:
-                        log_printf ("        value (string) . . . : '%s'", (char *)ptr_var->value);
-                        break;
-                    case PLUGIN_INFOLIST_POINTER:
-                        log_printf ("        value (pointer). . . : 0x%x", ptr_var->value);
-                        break;
-                    case PLUGIN_INFOLIST_TIME:
-                        log_printf ("        value (time) . . . . : %ld", *((time_t *)ptr_var->value));
-                        break;
-                }
-                log_printf ("        prev_var . . . . . . : 0x%x", ptr_var->prev_var);
-                log_printf ("        next_var . . . . . . : 0x%x", ptr_var->next_var);
-            }
-        }
-    }
-}

src/plugins/plugin-infolist.h

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
- * See README for License detail, AUTHORS for developers list.
- *
- * This program 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.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef __WEECHAT_PLUGIN_INFOLIST_H
-#define __WEECHAT_PLUGIN_INFOLIST_H 1
-
-/* list structures */
-
-enum t_plugin_infolist_type
-{
-    PLUGIN_INFOLIST_INTEGER = 0,
-    PLUGIN_INFOLIST_STRING,
-    PLUGIN_INFOLIST_POINTER,
-    PLUGIN_INFOLIST_TIME,
-};
-
-struct t_plugin_infolist_var
-{
-    char *name;                             /* variable name                */
-    enum t_plugin_infolist_type type;       /* type: integer, string, time  */
-    void *value;                            /* pointer to value             */
-    struct t_plugin_infolist_var *prev_var; /* link to previous variable    */
-    struct t_plugin_infolist_var *next_var; /* link to next variable        */
-};
-
-struct t_plugin_infolist_item
-{
-    struct t_plugin_infolist_var *vars;       /* item variables             */
-    struct t_plugin_infolist_var *last_var;   /* last variable              */
-    char *fields;                             /* fields list (NULL if never */
-                                              /*              asked)        */
-    struct t_plugin_infolist_item *prev_item; /* link to previous item      */
-    struct t_plugin_infolist_item *next_item; /* link to next item          */
-};
-
-struct t_plugin_infolist
-{
-    struct t_plugin_infolist_item *items;     /* link to items              */
-    struct t_plugin_infolist_item *last_item; /* last variable              */
-    struct t_plugin_infolist_item *ptr_item;  /* pointer to current item    */
-    struct t_plugin_infolist *prev_infolist;  /* link to previous list      */
-    struct t_plugin_infolist *next_infolist;  /* link to next list          */
-};
-
-/* list variables */
-
-extern struct t_plugin_infolist *plugin_infolists;
-extern struct t_plugin_infolist *last_plugin_infolist;
-
-/* list functions */
-
-extern struct t_plugin_infolist *plugin_infolist_new ();
-extern struct t_plugin_infolist_item *plugin_infolist_new_item (struct t_plugin_infolist *list);
-extern struct t_plugin_infolist_var *plugin_infolist_new_var_integer (struct t_plugin_infolist_item *item,
-                                                                      const char *name,
-                                                                      int value);
-extern struct t_plugin_infolist_var *plugin_infolist_new_var_string (struct t_plugin_infolist_item *item,
-                                                                     const char *name,
-                                                                     const char *value);
-extern struct t_plugin_infolist_var *plugin_infolist_new_var_pointer (struct t_plugin_infolist_item *item,
-                                                                      const char *name,
-                                                                      void *pointer);
-extern struct t_plugin_infolist_var *plugin_infolist_new_var_time (struct t_plugin_infolist_item *item,
-                                                                   const char *name,
-                                                                   time_t time);
-extern int plugin_infolist_valid (struct t_plugin_infolist *list);
-extern struct t_plugin_infolist_item *plugin_infolist_next_item (struct t_plugin_infolist *list);
-extern struct t_plugin_infolist_item *plugin_infolist_prev_item (struct t_plugin_infolist *list);
-extern char *plugin_infolist_get_fields (struct t_plugin_infolist *list);
-extern int plugin_infolist_get_integer (struct t_plugin_infolist *list,
-                                        const char *var);
-extern char *plugin_infolist_get_string (struct t_plugin_infolist *list,
-                                         const char *var);
-extern void *plugin_infolist_get_pointer (struct t_plugin_infolist *list,
-                                          const char *var);
-extern time_t plugin_infolist_get_time (struct t_plugin_infolist *list,
-                                        const char *var);
-extern void plugin_infolist_free (struct t_plugin_infolist *list);
-extern void plugin_infolist_print_log ();
-
-#endif /* plugin-infolist.h */

src/plugins/plugin.c

@@ -36,10 +36,12 @@
 #include "../core/weechat.h"
 #include "../core/wee-config.h"
 #include "../core/wee-hook.h"
+#include "../core/wee-infolist.h"
 #include "../core/wee-list.h"
 #include "../core/wee-log.h"
 #include "../core/wee-network.h"
 #include "../core/wee-string.h"
+#include "../core/wee-upgrade-file.h"
 #include "../core/wee-utf8.h"
 #include "../core/wee-util.h"
 #include "../gui/gui-bar.h"
@@ -50,7 +52,6 @@
 #include "plugin.h"
 #include "plugin-api.h"
 #include "plugin-config.h"
-#include "plugin-infolist.h"
 
 
 struct t_weechat_plugin *weechat_plugins = NULL;
@@ -69,6 +70,9 @@ plugin_search (const char *name)
 {
     struct t_weechat_plugin *ptr_plugin;
     
+    if (!name)
+        return NULL;
+    
     for (ptr_plugin = weechat_plugins; ptr_plugin;
          ptr_plugin = ptr_plugin->next_plugin)
     {
@@ -417,22 +421,30 @@ plugin_load (const char *filename)
         new_plugin->network_connect_to = &network_connect_to;
         
         new_plugin->info_get = &plugin_api_info_get;
-
-        new_plugin->infolist_new = &plugin_infolist_new;
-        new_plugin->infolist_new_item = &plugin_infolist_new_item;
-        new_plugin->infolist_new_var_integer = &plugin_infolist_new_var_integer;
-        new_plugin->infolist_new_var_string = &plugin_infolist_new_var_string;
-        new_plugin->infolist_new_var_pointer = &plugin_infolist_new_var_pointer;
-        new_plugin->infolist_new_var_time = &plugin_infolist_new_var_time;
+        
+        new_plugin->infolist_new = &infolist_new;
+        new_plugin->infolist_new_item = &infolist_new_item;
+        new_plugin->infolist_new_var_integer = &infolist_new_var_integer;
+        new_plugin->infolist_new_var_string = &infolist_new_var_string;
+        new_plugin->infolist_new_var_pointer = &infolist_new_var_pointer;
+        new_plugin->infolist_new_var_buffer = &infolist_new_var_buffer;
+        new_plugin->infolist_new_var_time = &infolist_new_var_time;
         new_plugin->infolist_get = &plugin_api_infolist_get;
         new_plugin->infolist_next = &plugin_api_infolist_next;
         new_plugin->infolist_prev = &plugin_api_infolist_prev;
+        new_plugin->infolist_reset_item_cursor = &plugin_api_infolist_reset_item_cursor;
         new_plugin->infolist_fields = &plugin_api_infolist_fields;
         new_plugin->infolist_integer = &plugin_api_infolist_integer;
         new_plugin->infolist_string = &plugin_api_infolist_string;
         new_plugin->infolist_pointer = &plugin_api_infolist_pointer;
+        new_plugin->infolist_buffer = &plugin_api_infolist_buffer;
         new_plugin->infolist_time = &plugin_api_infolist_time;
         new_plugin->infolist_free = &plugin_api_infolist_free;
+
+        new_plugin->upgrade_create = &upgrade_file_create;
+        new_plugin->upgrade_write_object = &upgrade_file_write_object;
+        new_plugin->upgrade_read = &upgrade_file_read;
+        new_plugin->upgrade_close = &upgrade_file_close;
         
         /* add new plugin to list */
         new_plugin->prev_plugin = last_weechat_plugin;
@@ -443,6 +455,10 @@ plugin_load (const char *filename)
             weechat_plugins = new_plugin;
         last_weechat_plugin = new_plugin;
 
+        /* associate orphan buffers with this plugin (if asked during upgrade
+           process) */
+        gui_buffer_set_plugin_for_upgrade (name, new_plugin);
+        
         /* build arguments for plugin */
         argc = 0;
         argv = NULL;
@@ -456,6 +472,7 @@ plugin_load (const char *filename)
                 {
                     if ((string_strcasecmp (plugin_argv[i], "-a") == 0)
                         || (string_strcasecmp (plugin_argv[i], "--no-connect") == 0)
+                        || (string_strcasecmp (plugin_argv[i], "--upgrade") == 0)
                         || (string_strncasecmp (plugin_argv[i], name, strlen (name)) == 0))
                     {
                         argv[argc] = plugin_argv[i];
@@ -841,6 +858,4 @@ plugin_print_log ()
         log_printf ("  prev_plugin. . . . . . : 0x%x", ptr_plugin->prev_plugin);
         log_printf ("  next_plugin. . . . . . : 0x%x", ptr_plugin->next_plugin);
     }
-
-    plugin_infolist_print_log ();
 }

src/plugins/scripts/lua/weechat-lua-api.c

@@ -3488,7 +3488,7 @@ weechat_lua_api_buffer_set (lua_State *L)
     property = lua_tostring (lua_current_interpreter, -2);
     value = lua_tostring (lua_current_interpreter, -1);
     
-    weechat_buffer_set (script_str2ptr (buffer), property, value);
+    weechat_buffer_set (script_str2ptr (buffer), property, (void *)value);
     
     LUA_RETURN_OK;
 }
@@ -4147,7 +4147,7 @@ weechat_lua_api_bar_set (lua_State *L)
     
     weechat_buffer_set (script_str2ptr (bar),
                         property,
-                        value);
+                        (void *)value);
     
     LUA_RETURN_OK;
 }

src/plugins/weechat-plugin.h

@@ -386,7 +386,7 @@ struct t_weechat_plugin
     char *(*buffer_get_string) (struct t_gui_buffer *buffer, const char *property);
     void *(*buffer_get_pointer) (struct t_gui_buffer *buffer, const char *property);
     void (*buffer_set) (struct t_gui_buffer *buffer, const char *property,
-                        const char *value);
+                        void *value);
     
     /* nicklist */
     struct t_gui_nick_group *(*nicklist_add_group) (struct t_gui_buffer *buffer,
@@ -455,30 +455,48 @@ struct t_weechat_plugin
     char *(*info_get) (struct t_weechat_plugin *plugin, const char *info);
     
     /* infolists */
-    struct t_plugin_infolist *(*infolist_new) ();
-    struct t_plugin_infolist_item *(*infolist_new_item) (struct t_plugin_infolist *list);
-    struct t_plugin_infolist_var *(*infolist_new_var_integer) (struct t_plugin_infolist_item *item,
-                                                               const char *name,
-                                                               int value);
-    struct t_plugin_infolist_var *(*infolist_new_var_string) (struct t_plugin_infolist_item *item,
-                                                              const char *name,
-                                                              const char *value);
-    struct t_plugin_infolist_var *(*infolist_new_var_pointer) (struct t_plugin_infolist_item *item,
-                                                               const char *name,
-                                                               void *pointer);
-    struct t_plugin_infolist_var *(*infolist_new_var_time) (struct t_plugin_infolist_item *item,
-                                                            const char *name,
-                                                            time_t time);
-    struct t_plugin_infolist *(*infolist_get) (const char *name, void *pointer,
-                                               const char *arguments);
-    int (*infolist_next) (struct t_plugin_infolist *infolist);
-    int (*infolist_prev) (struct t_plugin_infolist *infolist);
-    char *(*infolist_fields) (struct t_plugin_infolist *infolist);
-    int (*infolist_integer) (struct t_plugin_infolist *infolist, const char *var);
-    char *(*infolist_string) (struct t_plugin_infolist *infolist, const char *var);
-    void *(*infolist_pointer) (struct t_plugin_infolist *infolist, const char *var);
-    time_t (*infolist_time) (struct t_plugin_infolist *infolist, const char *var);
-    void (*infolist_free) (struct t_plugin_infolist *infolist);
+    struct t_infolist *(*infolist_new) ();
+    struct t_infolist_item *(*infolist_new_item) (struct t_infolist *infolist);
+    struct t_infolist_var *(*infolist_new_var_integer) (struct t_infolist_item *item,
+                                                        const char *name,
+                                                        int value);
+    struct t_infolist_var *(*infolist_new_var_string) (struct t_infolist_item *item,
+                                                       const char *name,
+                                                       const char *value);
+    struct t_infolist_var *(*infolist_new_var_pointer) (struct t_infolist_item *item,
+                                                        const char *name,
+                                                        void *pointer);
+    struct t_infolist_var *(*infolist_new_var_buffer) (struct t_infolist_item *item,
+                                                       const char *name,
+                                                       void *pointer,
+                                                       int size);
+    struct t_infolist_var *(*infolist_new_var_time) (struct t_infolist_item *item,
+                                                     const char *name,
+                                                     time_t time);
+    struct t_infolist *(*infolist_get) (const char *name, void *pointer,
+                                        const char *arguments);
+    int (*infolist_next) (struct t_infolist *infolist);
+    int (*infolist_prev) (struct t_infolist *infolist);
+    void (*infolist_reset_item_cursor) (struct t_infolist *infolist);
+    char *(*infolist_fields) (struct t_infolist *infolist);
+    int (*infolist_integer) (struct t_infolist *infolist, const char *var);
+    char *(*infolist_string) (struct t_infolist *infolist, const char *var);
+    void *(*infolist_pointer) (struct t_infolist *infolist, const char *var);
+    void *(*infolist_buffer) (struct t_infolist *infolist, const char *var,
+                              int *size);
+    time_t (*infolist_time) (struct t_infolist *infolist, const char *var);
+    void (*infolist_free) (struct t_infolist *infolist);
+
+    /* upgrade */
+    struct t_upgrade_file *(*upgrade_create) (const char *filename,
+                                              int write);
+    int (*upgrade_write_object) (struct t_upgrade_file *upgrade_file,
+                                 int object_id,
+                                 struct t_infolist *infolist);
+    int (*upgrade_read) (struct t_upgrade_file *upgrade_file,
+                         int (*callback_read)(int object_id,
+                                              struct t_infolist *infolist));
+    void (*upgrade_close) (struct t_upgrade_file *upgrade_file);
     
     /* WeeChat developers: ALWAYS add new functions at the end */
 };
@@ -905,25 +923,45 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
     weechat_plugin->infolist_new_var_string(__item, __name, __value)
 #define weechat_infolist_new_var_pointer(__item, __name, __pointer)     \
     weechat_plugin->infolist_new_var_pointer(__item, __name, __pointer)
+#define weechat_infolist_new_var_buffer(__item, __name, __buffer,       \
+                                        __size)                         \
+    weechat_plugin->infolist_new_var_buffer(__item, __name, __buffer,   \
+                                            __size)
 #define weechat_infolist_new_var_time(__item, __name, __time)           \
     weechat_plugin->infolist_new_var_time(__item, __name, __time)
 #define weechat_infolist_get(__name, __pointer, __arguments)            \
     weechat_plugin->infolist_get(__name, __pointer, __arguments)
-#define weechat_infolist_next(__list)           \
+#define weechat_infolist_next(__list)                                   \
     weechat_plugin->infolist_next(__list)
-#define weechat_infolist_prev(__list)           \
+#define weechat_infolist_prev(__list)                                   \
     weechat_plugin->infolist_prev(__list)
-#define weechat_infolist_fields(__list)         \
+#define weechat_infolist_reset_item_cursor(__list)                      \
+    weechat_plugin->infolist_reset_item_cursor(__list)
+#define weechat_infolist_fields(__list)                                 \
     weechat_plugin->infolist_fields(__list)
-#define weechat_infolist_integer(__item, __var)         \
+#define weechat_infolist_integer(__item, __var)                         \
     weechat_plugin->infolist_integer(__item, __var)
-#define weechat_infolist_string(__item, __var)          \
+#define weechat_infolist_string(__item, __var)                          \
     weechat_plugin->infolist_string(__item, __var)
-#define weechat_infolist_pointer(__item, __var)         \
+#define weechat_infolist_pointer(__item, __var)                         \
     weechat_plugin->infolist_pointer(__item, __var)
-#define weechat_infolist_time(__item, __var)            \
+#define weechat_infolist_buffer(__item, __var, __size)                  \
+    weechat_plugin->infolist_buffer(__item, __var, __size)
+#define weechat_infolist_time(__item, __var)                            \
     weechat_plugin->infolist_time(__item, __var)
-#define weechat_infolist_free(__list)           \
+#define weechat_infolist_free(__list)                                   \
     weechat_plugin->infolist_free(__list)
 
+/* upgrade */
+#define weechat_upgrade_create(__filename, __write)                     \
+    weechat_plugin->upgrade_create(__filename, __write)
+#define weechat_upgrade_write_object(__upgrade_file, __object_id,       \
+                                     __infolist)                        \
+    weechat_plugin->upgrade_write_object(__upgrade_file, __object_id,   \
+                                         __infolist)
+#define weechat_upgrade_read(__upgrade_file, __callback)                \
+    weechat_plugin->upgrade_read(__upgrade_file, __callback)
+#define weechat_upgrade_close(__upgrade_file)                           \
+    weechat_plugin->upgrade_close(__upgrade_file)
+
 #endif /* weechat-plugin.h */

src/plugins/xfer/CMakeLists.txt

@@ -22,7 +22,8 @@ xfer-command.c xfer-command.h
 xfer-config.c xfer-config.h
 xfer-dcc.c xfer-dcc.h
 xfer-file.c xfer-file.h
-xfer-network.c xfer-network.h)
+xfer-network.c xfer-network.h
+xfer-upgrade.c xfer-upgrade.h)
 SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(xfer)

src/plugins/xfer/Makefile.am

@@ -35,7 +35,9 @@ xfer_la_SOURCES = xfer.c \
                   xfer-file.c \
                   xfer-file.h \
                   xfer-network.c \
-                  xfer-network.h
+                  xfer-network.h \
+                  xfer-upgrade.c \
+                  xfer-upgrade.h
 
 xfer_la_LDFLAGS = -module
 xfer_la_LIBADD  = $(XFER_LFLAGS)

src/plugins/xfer/xfer-buffer.c

@@ -245,7 +245,7 @@ xfer_buffer_refresh (const char *hotlist)
             }
             line++;
         }
-        weechat_buffer_set (xfer_buffer, "hotlist", hotlist);
+        weechat_buffer_set (xfer_buffer, "hotlist", (void *)hotlist);
     }
 }
 

src/plugins/xfer/xfer-buffer.h

@@ -24,6 +24,9 @@ extern struct t_gui_buffer *xfer_buffer;
 extern int xfer_buffer_selected_line;
 
 extern void xfer_buffer_refresh (const char *hotlist);
+extern int xfer_buffer_input_cb (void *data, struct t_gui_buffer *buffer,
+                                 const char *input_data);
+extern int xfer_buffer_close_cb (void *data, struct t_gui_buffer *buffer);
 extern void xfer_buffer_open ();
 
 #endif /* xfer-buffer.h */

src/plugins/xfer/xfer-upgrade.c

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* xfer-upgrade.c: save/restore xfer plugin data */
+
+
+#include <stdlib.h>
+
+#include "../weechat-plugin.h"
+#include "xfer.h"
+#include "xfer-upgrade.h"
+#include "xfer-buffer.h"
+
+
+
+/*
+ * xfer_upgrade_save_xfers: save xfers info to upgrade file
+ */
+
+int
+xfer_upgrade_save_xfers (struct t_upgrade_file *upgrade_file)
+{
+    /* TODO: save xfer data */
+    (void) upgrade_file;
+    return 1;
+}
+
+/*
+ * xfer_upgrade_save: save upgrade file
+ *                    return 1 if ok, 0 if error
+ */
+
+int
+xfer_upgrade_save ()
+{
+    int rc;
+    struct t_upgrade_file *upgrade_file;
+    
+    upgrade_file = weechat_upgrade_create (XFER_UPGRADE_FILENAME, 1);
+    if (!upgrade_file)
+        return 0;
+    
+    rc = xfer_upgrade_save_xfers (upgrade_file);
+    
+    weechat_upgrade_close (upgrade_file);
+    
+    return rc;
+}
+
+/*
+ * xfer_upgrade_set_buffer_callbacks: restore buffers callbacks (input and
+ *                                    close) for buffers created by xfer plugin
+ */
+
+void
+xfer_upgrade_set_buffer_callbacks ()
+{
+    struct t_infolist *infolist;
+    struct t_gui_buffer *ptr_buffer;
+    
+    infolist = weechat_infolist_get ("buffer", NULL, NULL);
+    if (infolist)
+    {
+        while (weechat_infolist_next (infolist))
+        {
+            if (weechat_infolist_pointer (infolist, "plugin") == weechat_xfer_plugin)
+            {
+                ptr_buffer = weechat_infolist_pointer (infolist, "pointer");
+                weechat_buffer_set (ptr_buffer, "close_callback", &xfer_buffer_close_cb);
+                weechat_buffer_set (ptr_buffer, "input_callback", &xfer_buffer_input_cb);
+            }
+        }
+    }
+}
+
+/*
+ * xfer_upgrade_read_cb: read callback for xfer upgrade file
+ */
+
+int
+xfer_upgrade_read_cb (int object_id,
+                      struct t_infolist *infolist)
+{
+    /* TODO: write xfer read cb */
+    (void) object_id;
+    (void) infolist;
+    return WEECHAT_RC_OK;
+}
+
+/*
+ * xfer_upgrade_load: load upgrade file
+ *                    return 1 if ok, 0 if error
+ */
+
+int
+xfer_upgrade_load ()
+{
+    int rc;
+    struct t_upgrade_file *upgrade_file;
+    
+    xfer_upgrade_set_buffer_callbacks ();
+    
+    upgrade_file = weechat_upgrade_create (XFER_UPGRADE_FILENAME, 0);
+    rc = weechat_upgrade_read (upgrade_file, &xfer_upgrade_read_cb);
+    
+    return rc;
+}

src/plugins/xfer/xfer-upgrade.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __WEECHAT_XFER_UPGRADE_H
+#define __WEECHAT_XFER_UPGRADE_H 1
+
+#define XFER_UPGRADE_FILENAME "xfer"
+
+/* For developers: please add new values ONLY AT THE END of enums */
+
+enum t_xfer_upgrade_type
+{
+    XFER_UPGRADE_TYPE_XFER = 0,
+};
+
+extern int xfer_upgrade_save ();
+extern int xfer_upgrade_load ();
+
+#endif /* xfer-upgrade.h */

src/plugins/xfer/xfer.c

@@ -37,6 +37,7 @@
 #include "xfer-config.h"
 #include "xfer-file.h"
 #include "xfer-network.h"
+#include "xfer-upgrade.h"
 
 
 WEECHAT_PLUGIN_NAME("xfer");
@@ -70,6 +71,28 @@ int xfer_count = 0;                    /* number of xfer                    */
 
 int xfer_debug = 0;
 
+int xfer_signal_upgrade_received = 0;  /* signal "upgrade" received ?       */
+
+
+/*
+ * xfer_signal_upgrade_cb: callback for "upgrade" signal
+ */
+
+int
+xfer_signal_upgrade_cb (void *data, const char *signal, const char *type_data,
+                        void *signal_data)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) signal;
+    (void) type_data;
+    (void) signal_data;
+    
+    xfer_signal_upgrade_received = 1;
+    
+    return WEECHAT_RC_OK;
+}
+
 
 /*
  * xfer_create_directories: create directories for xfer plugin
@@ -296,8 +319,8 @@ xfer_port_in_use (int port)
 void
 xfer_send_signal (struct t_xfer *xfer, const char *signal)
 {
-    struct t_plugin_infolist *infolist;
-    struct t_plugin_infolist_item *item;
+    struct t_infolist *infolist;
+    struct t_infolist_item *item;
     char str_long[128];
     
     infolist = weechat_infolist_new ();
@@ -607,7 +630,7 @@ xfer_free (struct t_xfer *xfer)
 int
 xfer_add_cb (void *data, const char *signal, const char *type_data, void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     char *plugin_name, *plugin_id, *str_type, *str_protocol;
     char *remote_nick, *local_nick, *filename;
     int type, protocol;
@@ -635,7 +658,7 @@ xfer_add_cb (void *data, const char *signal, const char *type_data, void *signal
         return WEECHAT_RC_ERROR;
     }
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (!weechat_infolist_next (infolist))
     {
@@ -959,7 +982,7 @@ int
 xfer_start_resume_cb (void *data, const char *signal, const char *type_data,
                       void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_xfer *ptr_xfer;
     char *plugin_name, *plugin_id, *filename, *str_start_resume;
     int port;
@@ -978,7 +1001,7 @@ xfer_start_resume_cb (void *data, const char *signal, const char *type_data,
         return WEECHAT_RC_ERROR;
     }
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (!weechat_infolist_next (infolist))
     {
@@ -1036,7 +1059,7 @@ int
 xfer_accept_resume_cb (void *data, const char *signal, const char *type_data,
                        void *signal_data)
 {
-    struct t_plugin_infolist *infolist;
+    struct t_infolist *infolist;
     struct t_xfer *ptr_xfer;
     char *plugin_name, *plugin_id, *filename, *str_start_resume;
     int port;
@@ -1055,7 +1078,7 @@ xfer_accept_resume_cb (void *data, const char *signal, const char *type_data,
         return WEECHAT_RC_ERROR;
     }
     
-    infolist = (struct t_plugin_infolist *)signal_data;
+    infolist = (struct t_infolist *)signal_data;
     
     if (!weechat_infolist_next (infolist))
     {
@@ -1237,25 +1260,30 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     /* make C compiler happy */
     (void) plugin;
     
-    for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer)
+    xfer_config_write ();
+    
+    if (xfer_signal_upgrade_received)
+        xfer_upgrade_save ();
+    else
     {
-        if (ptr_xfer->sock >= 0)
+        for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer)
         {
-            if (ptr_xfer->status == XFER_STATUS_ACTIVE)
+            if (ptr_xfer->sock >= 0)
             {
-                weechat_printf (NULL,
-                                _("%s%s: aborting active xfer: \"%s\" from %s"),
-                                weechat_prefix ("error"), "xfer",
-                                ptr_xfer->filename, ptr_xfer->remote_nick);
-                weechat_log_printf (_("%s%s: aborting active xfer: \"%s\" from %s"),
-                                    "", "xfer",
+                if (ptr_xfer->status == XFER_STATUS_ACTIVE)
+                {
+                    weechat_printf (NULL,
+                                    _("%s%s: aborting active xfer: \"%s\" from %s"),
+                                    weechat_prefix ("error"), "xfer",
                                     ptr_xfer->filename, ptr_xfer->remote_nick);
+                    weechat_log_printf (_("%s%s: aborting active xfer: \"%s\" from %s"),
+                                        "", "xfer",
+                                        ptr_xfer->filename, ptr_xfer->remote_nick);
+                }
+                xfer_close (ptr_xfer, XFER_STATUS_FAILED);
             }
-            xfer_close (ptr_xfer, XFER_STATUS_FAILED);
         }
     }
     
-    xfer_config_write ();
-    
     return WEECHAT_RC_OK;
 }