pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 05:46:38 +02:00
Code Activity

Fixed bug with /upgrade when servers buffer (with one buffer for all servers) is moved to buffer # > 1

Browse Source
This commit is contained in:
Sebastien Helleu
2006-01-26 13:57:27 +00:00
parent 7711d548c0
commit 0e91f0c208
8 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2006-01-26
Version 0.1.8 (under dev!):
* fixed bug with /upgrade and servers buffer
* fixed bug with "get_dcc_info" plugin interface function
* added new scroll keys for a few lines up/down (default: meta-pgup/pgdn)
(patch from Pistos)
src/common/session.c
+4
View File
@@ -387,6 +387,7 @@ session_save_buffers (FILE *file)
rc = rc && (session_write_str (file, SESSION_BUFF_SERVER, SERVER(ptr_buffer) ? SERVER(ptr_buffer)->name : NULL));
rc = rc && (session_write_str (file, SESSION_BUFF_CHANNEL, CHANNEL(ptr_buffer) ? CHANNEL(ptr_buffer)->name : NULL));
rc = rc && (session_write_int (file, SESSION_BUFF_DCC, ptr_buffer->dcc));
rc = rc && (session_write_int (file, SESSION_BUFF_ALL_SERVERS, ptr_buffer->all_servers));
rc = rc && (session_write_id (file, SESSION_BUFF_END));
if (!rc)
@@ -1413,6 +1414,9 @@ session_load_buffer (FILE *file)
{
case SESSION_BUFF_END:
return 1;
case SESSION_BUFF_ALL_SERVERS:
rc = rc && (session_read_int (file, &(session_current_buffer->all_servers)));
break;
default:
weechat_log_printf (_("session: warning: ignoring value from "
"buffer (object id: %d)\n"));
src/common/session.h
+2 -1
View File
@@ -153,7 +153,8 @@ enum t_session_buffer
SESSION_BUFF_END = 0,
SESSION_BUFF_SERVER,
SESSION_BUFF_CHANNEL,
SESSION_BUFF_DCC
SESSION_BUFF_DCC,
SESSION_BUFF_ALL_SERVERS
};
enum t_session_line
src/common/weechat.c
+1 -1
View File
@@ -1042,10 +1042,10 @@ main (int argc, char *argv[])
weechat_config_read (); /* read configuration */
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
fifo_create (); /* FIFO pipe for remote control */
if (weechat_session)
session_load (weechat_session); /* load previous session if asked */
weechat_welcome_message (); /* display WeeChat welcome message */
#ifdef PLUGINS
plugin_init (auto_load_plugins); /* init plugin interface(s) */
#endif
weechat/ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2006-01-26
Version 0.1.8 (under dev!):
* fixed bug with /upgrade and servers buffer
* fixed bug with "get_dcc_info" plugin interface function
* added new scroll keys for a few lines up/down (default: meta-pgup/pgdn)
(patch from Pistos)
weechat/src/common/session.c
+4
View File
@@ -387,6 +387,7 @@ session_save_buffers (FILE *file)
rc = rc && (session_write_str (file, SESSION_BUFF_SERVER, SERVER(ptr_buffer) ? SERVER(ptr_buffer)->name : NULL));
rc = rc && (session_write_str (file, SESSION_BUFF_CHANNEL, CHANNEL(ptr_buffer) ? CHANNEL(ptr_buffer)->name : NULL));
rc = rc && (session_write_int (file, SESSION_BUFF_DCC, ptr_buffer->dcc));
rc = rc && (session_write_int (file, SESSION_BUFF_ALL_SERVERS, ptr_buffer->all_servers));
rc = rc && (session_write_id (file, SESSION_BUFF_END));
if (!rc)
@@ -1413,6 +1414,9 @@ session_load_buffer (FILE *file)
{
case SESSION_BUFF_END:
return 1;
case SESSION_BUFF_ALL_SERVERS:
rc = rc && (session_read_int (file, &(session_current_buffer->all_servers)));
break;
default:
weechat_log_printf (_("session: warning: ignoring value from "
"buffer (object id: %d)\n"));
weechat/src/common/session.h
+2 -1
View File
@@ -153,7 +153,8 @@ enum t_session_buffer
SESSION_BUFF_END = 0,
SESSION_BUFF_SERVER,
SESSION_BUFF_CHANNEL,
SESSION_BUFF_DCC
SESSION_BUFF_DCC,
SESSION_BUFF_ALL_SERVERS
};
enum t_session_line
weechat/src/common/weechat.c
+1 -1
View File
@@ -1042,10 +1042,10 @@ main (int argc, char *argv[])
weechat_config_read (); /* read configuration */
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
fifo_create (); /* FIFO pipe for remote control */
if (weechat_session)
session_load (weechat_session); /* load previous session if asked */
weechat_welcome_message (); /* display WeeChat welcome message */
#ifdef PLUGINS
plugin_init (auto_load_plugins); /* init plugin interface(s) */
#endif