New config functions, almost entirely rewritten from scratch

6 files changed, 11 insertions, 7 deletions

diff --git a/src/gui/gtk/gui-gtk-chat.c b/src/gui/gtk/gui-gtk-chat.c
index c3f6f409f..97a11ddb8 100644
--- a/src/gui/gtk/gui-gtk-chat.c
+++ b/src/gui/gtk/gui-gtk-chat.c
@@ -31,6 +31,7 @@
 #include "../../core/wee-config.h"
 #include "../../core/wee-utf8.h"
 #include "../gui-chat.h"
+#include "../gui-color.h"
 #include "../gui-main.h"
 #include "../gui-window.h"
 #include "gui-gtk.h"
diff --git a/src/gui/gtk/gui-gtk-color.c b/src/gui/gtk/gui-gtk-color.c
index 3107ae391..e4a52b214 100644
--- a/src/gui/gtk/gui-gtk-color.c
+++ b/src/gui/gtk/gui-gtk-color.c
@@ -31,6 +31,7 @@
 #include "../../core/wee-config.h"
 #include "../../core/wee-string.h"
 #include "../gui-color.h"
+#include "../gui-chat.h"
 #include "gui-gtk.h"
 
 
diff --git a/src/gui/gtk/gui-gtk-infobar.c b/src/gui/gtk/gui-gtk-infobar.c
index f546cbf97..b6bcafd33 100644
--- a/src/gui/gtk/gui-gtk-infobar.c
+++ b/src/gui/gtk/gui-gtk-infobar.c
@@ -29,7 +29,7 @@
 #include "../../core/weechat.h"
 #include "../../core/wee-config.h"
 #include "../gui-infobar.h"
-#include "../gui-main.h"
+#include "../gui-window.h"
 #include "gui-gtk.h"
 
 
diff --git a/src/gui/gtk/gui-gtk-input.c b/src/gui/gtk/gui-gtk-input.c
index 35111c01c..16347735b 100644
--- a/src/gui/gtk/gui-gtk-input.c
+++ b/src/gui/gtk/gui-gtk-input.c
@@ -30,7 +30,7 @@
 #include "../../core/wee-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-input.h"
-#include "../gui-main.h"
+#include "../gui-window.h"
 #include "gui-gtk.h"
 
 
diff --git a/src/gui/gtk/gui-gtk-main.c b/src/gui/gtk/gui-gtk-main.c
index 46fd7380c..33d1fc9b2 100644
--- a/src/gui/gtk/gui-gtk-main.c
+++ b/src/gui/gtk/gui-gtk-main.c
@@ -174,7 +174,7 @@ gui_main_init ()
         else
             gui_init_ok = 0;
         
-        if (cfg_look_set_title)
+        if (CONFIG_BOOLEAN(config_look_set_title))
             gui_window_title_set ();
     }
 }
@@ -226,6 +226,6 @@ gui_main_end ()
         gui_infobar_remove ();
 
     /* reset title */
-    if (cfg_look_set_title)
+    if (CONFIG_BOOLEAN(config_look_set_title))
 	gui_window_title_reset ();
 }
diff --git a/src/gui/gtk/gui-gtk-window.c b/src/gui/gtk/gui-gtk-window.c
index e6f00e873..73c310bf8 100644
--- a/src/gui/gtk/gui-gtk-window.c
+++ b/src/gui/gtk/gui-gtk-window.c
@@ -30,6 +30,7 @@
 #include "../../core/wee-config.h"
 #include "../../core/wee-log.h"
 #include "../gui-window.h"
+#include "../gui-chat.h"
 #include "../gui-hotlist.h"
 #include "../gui-nicklist.h"
 #include "../gui-main.h"
@@ -300,8 +301,9 @@ gui_window_scroll_up (struct t_gui_window *window)
         gui_chat_calculate_line_diff (window, &window->start_line,
                                       &window->start_line_pos,
                                       (window->start_line) ?
-                                      (-1) * cfg_look_scroll_amount :
-                                      (-1) * ( (window->win_chat_height - 1) + cfg_look_scroll_amount));
+                                      (-1) * CONFIG_INTEGER(config_look_scroll_amount) :
+                                      (-1) * ( (window->win_chat_height - 1) +
+                                               CONFIG_INTEGER(config_look_scroll_amount)));
         gui_chat_draw (window->buffer, 0);
         gui_status_draw (window->buffer, 0);
     }
@@ -324,7 +326,7 @@ gui_window_scroll_down (struct t_gui_window *window)
     {
         gui_chat_calculate_line_diff (window, &window->start_line,
                                       &window->start_line_pos,
-                                      cfg_look_scroll_amount);
+                                      CONFIG_INTEGER(config_look_scroll_amount));
         
         /* check if we can display all */
         ptr_line = window->start_line;