more xchat config compatibility

This commit is contained in:
berkeviktor@aol.com 2010-09-19 07:03:29 +02:00
parent 11145992b6
commit 7ffb0db78e

View File

@ -140,7 +140,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugi
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
--- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/common/cfgfiles.c 2010-09-19 05:27:43 +0200
+++ xchat-wdk/src/common/cfgfiles.c 2010-09-19 07:01:51 +0200
@@ -17,7 +17,6 @@
*/
@ -187,15 +187,27 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
}
return xdir_fs;
}
@@ -461,6 +466,7 @@
@@ -536,6 +541,7 @@
#ifdef WIN32
{"identd", P_OFFINT (identd), TYPE_BOOL},
{"tab_chans", P_OFFINT (tabchannels), TYPE_BOOL},
{"tab_dialogs", P_OFFINT (privmsgtab), TYPE_BOOL},
+ {"tab_icons", P_OFFINT (tab_icons), TYPE_BOOL},
{"tab_layout", P_OFFINT (tab_layout), TYPE_INT},
{"tab_new_to_front", P_OFFINT (newtabstofront), TYPE_INT},
{"tab_notices", P_OFFINT (notices_tabs), TYPE_BOOL},
@@ -546,9 +552,11 @@
{"tab_sort", P_OFFINT (tab_sort), TYPE_BOOL},
{"tab_trunc", P_OFFINT (truncchans), TYPE_INT},
{"tab_utils", P_OFFINT (windows_as_tabs), TYPE_BOOL},
+ {"tab_xp", P_OFFINT (tab_xp), TYPE_BOOL},
{"text_background", P_OFFSET (background), TYPE_STR},
{"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL},
+ {"text_emoticons", P_OFFINT (emoticons), TYPE_BOOL},
#endif
{"input_balloon_chans", P_OFFINT (input_balloon_chans), TYPE_BOOL},
{"input_balloon_hilight", P_OFFINT (input_balloon_hilight), TYPE_BOOL},
@@ -648,6 +654,7 @@
{"text_font", P_OFFSET (font_normal), TYPE_STR},
{"text_indent", P_OFFINT (indent_nicks), TYPE_BOOL},
{"text_max_indent", P_OFFINT (max_auto_indent), TYPE_INT},
@@ -648,6 +656,7 @@
prefs.dialog_height = 256;
prefs.gui_join_dialog = 1;
prefs.gui_quit_dialog = 1;
@ -629,7 +641,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
"NAME LEAVE\n" "CMD part &2\n\n"\
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
--- xchat-wdk.orig/src/common/xchat.h 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/common/xchat.h 2010-09-19 05:27:43 +0200
+++ xchat-wdk/src/common/xchat.h 2010-09-19 07:01:27 +0200
@@ -12,12 +12,14 @@
#include "history.h"
@ -655,11 +667,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
#include <direct.h>
#define F_OK 0
#define X_OK 1
@@ -297,6 +299,7 @@
@@ -297,6 +299,9 @@
unsigned int confmode;
unsigned int utf8_locale;
unsigned int identd;
+ unsigned int emoticons;
+ unsigned int tab_icons;
+ unsigned int tab_xp;
unsigned int ctcp_number_limit; /*flood */
unsigned int ctcp_time_limit; /*seconds of floods */