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

Rebrand xchatprefs

This commit is contained in:
Berke Viktor 2012-10-22 09:00:35 +02:00
parent 25f2506984
commit fba30c4cf8
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -651,7 +651,7 @@ load_config (void)
username = convert_with_fallback (username, "username"); username = convert_with_fallback (username, "username");
realname = convert_with_fallback (realname, "realname"); realname = convert_with_fallback (realname, "realname");
memset (&prefs, 0, sizeof (struct xchatprefs)); memset (&prefs, 0, sizeof (struct hexchatprefs));
/* put in default values, anything left out is automatically zero */ /* put in default values, anything left out is automatically zero */
prefs.local_ip = 0xffffffff; prefs.local_ip = 0xffffffff;

8
src/common/cfgfiles.h
View File

@ -35,10 +35,10 @@ FILE *xchat_fopen_file (const char *file, const char *mode, int xof_flags);
#define STRUCT_OFFSET_INT(type,field) \ #define STRUCT_OFFSET_INT(type,field) \
( (unsigned int) (((int *) (&(((type *) NULL)->field)))- ((int *) NULL)) ) ( (unsigned int) (((int *) (&(((type *) NULL)->field)))- ((int *) NULL)) )
#define P_OFFSET(field) STRUCT_OFFSET_STR(struct xchatprefs, field),sizeof(prefs.field) #define P_OFFSET(field) STRUCT_OFFSET_STR(struct hexchatprefs, field),sizeof(prefs.field)
#define P_OFFSETNL(field) STRUCT_OFFSET_STR(struct xchatprefs, field) #define P_OFFSETNL(field) STRUCT_OFFSET_STR(struct hexchatprefs, field)
#define P_OFFINT(field) STRUCT_OFFSET_INT(struct xchatprefs, field),0 #define P_OFFINT(field) STRUCT_OFFSET_INT(struct hexchatprefs, field),0
#define P_OFFINTNL(field) STRUCT_OFFSET_INT(struct xchatprefs, field) #define P_OFFINTNL(field) STRUCT_OFFSET_INT(struct hexchatprefs, field)
struct prefs struct prefs
{ {

2
src/common/xchat.c
View File

@ -93,7 +93,7 @@ gint arg_existing = FALSE;
struct session *current_tab; struct session *current_tab;
struct session *current_sess = 0; struct session *current_sess = 0;
struct xchatprefs prefs; struct hexchatprefs prefs;
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
SSL_CTX *ctx = NULL; SSL_CTX *ctx = NULL;

2
src/common/xchat.h
View File

@ -102,7 +102,7 @@ struct nbexec
struct session *sess; struct session *sess;
}; };
struct xchatprefs struct hexchatprefs
{ {
char nick1[NICKLEN]; char nick1[NICKLEN];
char nick2[NICKLEN]; char nick2[NICKLEN];

2
src/common/xchatc.h
View File

@ -1,7 +1,7 @@
#ifndef XCHAT_C_H #ifndef XCHAT_C_H
#define XCHAT_C_H #define XCHAT_C_H
extern struct xchatprefs prefs; extern struct hexchatprefs prefs;
extern int xchat_is_quitting; extern int xchat_is_quitting;
extern gint arg_skip_plugins; /* command-line args */ extern gint arg_skip_plugins; /* command-line args */

4
src/fe-gtk/setup.c
View File

@ -66,7 +66,7 @@ GtkStyle *create_input_style (GtkStyle *);
static int last_selected_page = 0; static int last_selected_page = 0;
static int last_selected_row = 0; /* sound row */ static int last_selected_row = 0; /* sound row */
static gboolean color_change; static gboolean color_change;
static struct xchatprefs setup_prefs; static struct hexchatprefs setup_prefs;
static GtkWidget *cancel_button; static GtkWidget *cancel_button;
static GtkWidget *font_dialog = NULL; static GtkWidget *font_dialog = NULL;
@ -2182,7 +2182,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout)
} }
static void static void
setup_apply (struct xchatprefs *pr) setup_apply (struct hexchatprefs *pr)
{ {
#ifdef WIN32 #ifdef WIN32
PangoFontDescription *old_desc; PangoFontDescription *old_desc;