New backlog option in logger plugin, added variable names in .h files, replaced "void *" pointers by structures

8 files changed, 21 insertions, 12 deletions

diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 1558c4708..834583877 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -31,6 +31,7 @@
 #include "../../core/wee-config.h"
 #include "../../core/wee-string.h"
 #include "../../core/wee-utf8.h"
+#include "../gui-buffer.h"
 #include "../gui-chat.h"
 #include "../gui-color.h"
 #include "../gui-main.h"
@@ -849,13 +850,14 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
 }
 
 /*
- * gui_chat_calculate_line_diff: returns pointer to line & offset for a difference
- *                               with given line
+ * gui_chat_calculate_line_diff: returns pointer to line & offset for a
+ *                               difference with given line
  */
 
 void
-gui_chat_calculate_line_diff (struct t_gui_window *window, struct t_gui_line **line,
-                              int *line_pos, int difference)
+gui_chat_calculate_line_diff (struct t_gui_window *window,
+                              struct t_gui_line **line, int *line_pos,
+                              int difference)
 {
     int backward, current_size;
     
diff --git a/src/gui/curses/gui-curses-input.c b/src/gui/curses/gui-curses-input.c
index 68eefc5a8..657ca3962 100644
--- a/src/gui/curses/gui-curses-input.c
+++ b/src/gui/curses/gui-curses-input.c
@@ -32,6 +32,7 @@
 #include "../../core/wee-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-input.h"
+#include "../gui-buffer.h"
 #include "../gui-color.h"
 #include "../gui-keyboard.h"
 #include "../gui-main.h"
diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index 86f542606..89b5ed35b 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -31,6 +31,7 @@
 #include "../../core/wee-utf8.h"
 #include "../../core/wee-string.h"
 #include "../gui-keyboard.h"
+#include "../gui-buffer.h"
 #include "../gui-color.h"
 #include "../gui-input.h"
 #include "../gui-completion.h"
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index eebdade5c..e408161d2 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -37,6 +37,7 @@
 #include "../../core/wee-util.h"
 #include "../../plugins/plugin.h"
 #include "../gui-main.h"
+#include "../gui-buffer.h"
 #include "../gui-chat.h"
 #include "../gui-color.h"
 #include "../gui-infobar.h"
@@ -198,7 +199,7 @@ gui_main_end ()
 
     /* delete all buffers */
     while (gui_buffers)
-        gui_buffer_free (gui_buffers, 0);
+        gui_buffer_close (gui_buffers, 0);
     
     /* delete global history */
     gui_history_global_free ();
diff --git a/src/gui/curses/gui-curses-nicklist.c b/src/gui/curses/gui-curses-nicklist.c
index a0a253609..c97484076 100644
--- a/src/gui/curses/gui-curses-nicklist.c
+++ b/src/gui/curses/gui-curses-nicklist.c
@@ -30,6 +30,7 @@
 #include "../../core/wee-string.h"
 #include "../../core/wee-utf8.h"
 #include "../gui-nicklist.h"
+#include "../gui-buffer.h"
 #include "../gui-chat.h"
 #include "../gui-color.h"
 #include "../gui-main.h"
diff --git a/src/gui/curses/gui-curses-status.c b/src/gui/curses/gui-curses-status.c
index 9422a7f44..f941f197a 100644
--- a/src/gui/curses/gui-curses-status.c
+++ b/src/gui/curses/gui-curses-status.c
@@ -31,6 +31,7 @@
 #include "../../core/wee-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-status.h"
+#include "../gui-buffer.h"
 #include "../gui-color.h"
 #include "../gui-main.h"
 #include "../gui-hotlist.h"
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 8fce32f39..cdc650ca3 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -34,6 +34,7 @@
 #include "../../core/wee-log.h"
 #include "../../core/wee-string.h"
 #include "../gui-window.h"
+#include "../gui-buffer.h"
 #include "../gui-chat.h"
 #include "../gui-color.h"
 #include "../gui-hotlist.h"
@@ -77,7 +78,7 @@ gui_window_objects_init (struct t_gui_window *window)
 {
     struct t_gui_curses_objects *new_objects;
 
-    if ((new_objects = (struct t_gui_curses_objects *) malloc (sizeof (struct t_gui_curses_objects))))
+    if ((new_objects = (struct t_gui_curses_objects *)malloc (sizeof (struct t_gui_curses_objects))))
     {
         window->gui_objects = new_objects;
         GUI_CURSES(window)->win_title = NULL;
diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h
index 2801b6862..f1e6aea17 100644
--- a/src/gui/curses/gui-curses.h
+++ b/src/gui/curses/gui-curses.h
@@ -50,12 +50,13 @@ extern struct t_gui_color gui_weechat_colors[];
 extern int gui_refresh_screen_needed;
 
 /* color functions */
-extern int gui_color_get_pair (int);
+extern int gui_color_get_pair (int num_color);
 extern void gui_color_init ();
 
 /* chat functions */
-extern void gui_chat_calculate_line_diff (struct t_gui_window *,
-                                          struct t_gui_line **, int *, int);
+extern void gui_chat_calculate_line_diff (struct t_gui_window *window,
+                                          struct t_gui_line **line,
+                                          int *line_pos, int difference);
 
 /* keyboard functions */
 extern void gui_keyboard_default_bindings ();
@@ -63,9 +64,9 @@ extern void gui_keyboard_read ();
 extern void gui_keyboard_flush ();
 
 /* window functions */
-extern void gui_window_wprintw (WINDOW *, char *, ...);
-extern void gui_window_curses_clear (WINDOW *, int);
-extern void gui_window_set_weechat_color (WINDOW *, int);
+extern void gui_window_wprintw (WINDOW *window, char *data, ...);
+extern void gui_window_curses_clear (WINDOW *window, int num_color);
+extern void gui_window_set_weechat_color (WINDOW *window, int num_color);
 extern void gui_window_refresh_screen_sigwinch ();
 extern void gui_window_title_set ();
 extern void gui_window_title_reset ();