diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-10-20 17:56:38 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-10-20 17:56:38 +0200 |
| commit | c1bc4303ceeb04766adc7700efa86e42110b7874 (patch) | |
| tree | 03662533a8024604d95b539756711d74a55422de /src/common | |
| parent | 99b68f6e24987837486c75bfced6ecbb27881729 (diff) | |
Fix TYPE_BOOL vs unsigned int inconsistency
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cfgfiles.c | 2 | ||||
| -rw-r--r-- | src/common/xchat.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index ef51cb75..014f6d98 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -583,7 +583,7 @@ const struct prefs vars[] = { {"text_background", P_OFFSET (background), TYPE_STR}, {"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL}, #ifdef WIN32 - {"text_emoticons", P_OFFINT (emoticons), TYPE_BOOL}, + {"text_emoticons", P_OFFINT (text_emoticons), TYPE_BOOL}, #endif {"text_font", P_OFFSET (font_normal), TYPE_STR}, #ifdef WIN32 diff --git a/src/common/xchat.h b/src/common/xchat.h index cf3dc439..521a737b 100644 --- a/src/common/xchat.h +++ b/src/common/xchat.h @@ -156,7 +156,6 @@ struct xchatprefs int away_timeout; int away_size_max; - int away_omit_alerts; int gui_pane_left_size; int gui_pane_right_size; @@ -186,11 +185,7 @@ struct xchatprefs int completion_sort; int gui_win_state; int gui_url_mod; - int gui_usermenu; - int gui_join_dialog; - int gui_quit_dialog; #ifdef WIN32 - int gui_one_instance; int gui_lang; #endif int dialog_left; @@ -280,12 +275,16 @@ struct xchatprefs unsigned int show_away_message; unsigned int auto_unmark_away; unsigned int away_track; + unsigned int away_omit_alerts; unsigned int userhost; unsigned int irc_whois_front; unsigned int use_server_tab; unsigned int notices_tabs; unsigned int style_namelistgad; 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 indent_nicks; unsigned int text_replay; @@ -313,7 +312,8 @@ struct xchatprefs unsigned int utf8_locale; #ifdef WIN32 unsigned int identd; - unsigned int emoticons; + unsigned int text_emoticons; + unsigned int gui_one_instance; #endif unsigned int ctcp_number_limit; /*flood */ |