SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix TYPE_BOOL vs unsigned int inconsistency

This commit is contained in:
Berke Viktor 2012-10-20 17:56:38 +02:00
parent 99b68f6e24
commit c1bc4303ce
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -583,7 +583,7 @@ const struct prefs vars[] = {
{"text_background", P_OFFSET (background), TYPE_STR}, {"text_background", P_OFFSET (background), TYPE_STR},
{"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL}, {"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL},
#ifdef WIN32 #ifdef WIN32
{"text_emoticons", P_OFFINT (emoticons), TYPE_BOOL}, {"text_emoticons", P_OFFINT (text_emoticons), TYPE_BOOL},
#endif #endif
{"text_font", P_OFFSET (font_normal), TYPE_STR}, {"text_font", P_OFFSET (font_normal), TYPE_STR},
#ifdef WIN32 #ifdef WIN32

12
src/common/xchat.h
View File

@ -156,7 +156,6 @@ struct xchatprefs
int away_timeout; int away_timeout;
int away_size_max; int away_size_max;
int away_omit_alerts;
int gui_pane_left_size; int gui_pane_left_size;
int gui_pane_right_size; int gui_pane_right_size;
@ -186,11 +185,7 @@ struct xchatprefs
int completion_sort; int completion_sort;
int gui_win_state; int gui_win_state;
int gui_url_mod; int gui_url_mod;
int gui_usermenu;
int gui_join_dialog;
int gui_quit_dialog;
#ifdef WIN32 #ifdef WIN32
int gui_one_instance;
int gui_lang; int gui_lang;
#endif #endif
int dialog_left; int dialog_left;
@ -280,12 +275,16 @@ struct xchatprefs
unsigned int show_away_message; unsigned int show_away_message;
unsigned int auto_unmark_away; unsigned int auto_unmark_away;
unsigned int away_track; unsigned int away_track;
unsigned int away_omit_alerts;
unsigned int userhost; unsigned int userhost;
unsigned int irc_whois_front; unsigned int irc_whois_front;
unsigned int use_server_tab; unsigned int use_server_tab;
unsigned int notices_tabs; unsigned int notices_tabs;
unsigned int style_namelistgad; unsigned int style_namelistgad;
unsigned int style_inputbox; unsigned int style_inputbox;
unsigned int gui_join_dialog;
unsigned int gui_quit_dialog;
unsigned int gui_usermenu;
unsigned int windows_as_tabs; unsigned int windows_as_tabs;
unsigned int indent_nicks; unsigned int indent_nicks;
unsigned int text_replay; unsigned int text_replay;
@ -313,7 +312,8 @@ struct xchatprefs
unsigned int utf8_locale; unsigned int utf8_locale;
#ifdef WIN32 #ifdef WIN32
unsigned int identd; unsigned int identd;
unsigned int emoticons; unsigned int text_emoticons;
unsigned int gui_one_instance;
#endif #endif
unsigned int ctcp_number_limit; /*flood */ unsigned int ctcp_number_limit; /*flood */