From 270fc20989fd4b12e9a08bacaf6e44b63806cfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Pettersson?= Date: Sat, 11 Oct 2014 11:44:29 +0200 Subject: [PATCH] Moved profile_default option array to profile.{h,c}. --- src/twc-config.c | 2 -- src/twc-config.h | 3 --- src/twc-profile.c | 1 + src/twc-profile.h | 1 + 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/twc-config.c b/src/twc-config.c index dc709eb..91f0700 100644 --- a/src/twc-config.c +++ b/src/twc-config.c @@ -34,8 +34,6 @@ struct t_config_file *twc_config_file = NULL; struct t_config_section *twc_config_section_profile = NULL; struct t_config_section *twc_config_section_profile_default = NULL; -struct t_config_option *twc_config_profile_default[TWC_PROFILE_NUM_OPTIONS]; - char *twc_profile_option_names[TWC_PROFILE_NUM_OPTIONS] = { "save_file", diff --git a/src/twc-config.h b/src/twc-config.h index d99b89e..b90fe72 100644 --- a/src/twc-config.h +++ b/src/twc-config.h @@ -20,9 +20,6 @@ #ifndef TOX_WEECHAT_CONFIG_H #define TOX_WEECHAT_CONFIG_H -#include "twc-profile.h" -extern struct t_config_option *twc_config_profile_default[TWC_PROFILE_NUM_OPTIONS]; - void twc_config_init(); diff --git a/src/twc-profile.c b/src/twc-profile.c index 1f4acf8..5086026 100644 --- a/src/twc-profile.c +++ b/src/twc-profile.c @@ -40,6 +40,7 @@ #include "twc-profile.h" struct t_twc_list *twc_profiles = NULL; +struct t_config_option *twc_config_profile_default[TWC_PROFILE_NUM_OPTIONS]; /** * Get a profile's expanded data path, replacing: diff --git a/src/twc-profile.h b/src/twc-profile.h index e4a1500..ec3143e 100644 --- a/src/twc-profile.h +++ b/src/twc-profile.h @@ -56,6 +56,7 @@ struct t_twc_profile }; extern struct t_twc_list *twc_profiles; +extern struct t_config_option *twc_config_profile_default[TWC_PROFILE_NUM_OPTIONS]; #define TWC_PROFILE_OPTION_BOOLEAN(profile, index) \ (!weechat_config_option_is_null(profile->options[index]) \