Attachment #2093 for bug #4776

View | Details | Raw Unified | Return to bug 4776
Collapse All | Expand All

Lines 754-760 Link Here

(-)xchat-1.8.9/configure (-1 / +1 lines)
754		754
755	PACKAGE=xchat	755	PACKAGE=xchat
756		756
757	VERSION=1.8.9	757	VERSION=1.8.9-euIRC-0.1
758		758
759	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then	759	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
760	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }	760	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

Lines 208-214 Link Here

(-)xchat-1.8.9/src/common/userlist.c (+5 lines)
208	switch (prefix)	208	switch (prefix)
209	{	209	{
210	case '*':	210	case '*':
		211	user->founder = level;
		212	sess->ops += offset;
		213	break;
		214	case '!':
211	user->admin = level;	215	user->admin = level;
		216	sess->ops += offset;
212	break;	217	break;
213	case '@':	218	case '@':
214	user->op = level;	219	user->op = level;

Lines 11-16 Link Here

(-)xchat-1.8.9/src/common/userlist.h (+1 lines)
11	unsigned int access; /* axs bit field */	11	unsigned int access; /* axs bit field */
12	char prefix; /* @ + % */	12	char prefix; /* @ + % */
13	unsigned int admin:1;	13	unsigned int admin:1;
		14	unsigned int founder:1;
14	unsigned int op:1;	15	unsigned int op:1;
15	unsigned int hop:1;	16	unsigned int hop:1;
16	unsigned int voice:1;	17	unsigned int voice:1;

Lines 450-456 Link Here

(-)xchat-1.8.9/src/fe-gtk/Makefile.in (-1 / +1 lines)
450	../common/../../config.h ../common/history.h gtkutil.h \	450	../common/../../config.h ../common/history.h gtkutil.h \
451	../pixmaps/globe.xpm ../pixmaps/server.xpm ../pixmaps/admin.xpm \	451	../pixmaps/globe.xpm ../pixmaps/server.xpm ../pixmaps/admin.xpm \
452	../pixmaps/op.xpm ../pixmaps/hop.xpm ../pixmaps/voice.xpm \	452	../pixmaps/op.xpm ../pixmaps/hop.xpm ../pixmaps/voice.xpm \
453	../pixmaps/xchat_mini.xpm ../pixmaps/xchat.xpm	453	../pixmaps/xchat_mini.xpm ../pixmaps/xchat.xpm ../pixmaps/founder.xpm
454	plugingui.o: plugingui.c fe-gtk.h ../../config.h ../common/xchat.h \	454	plugingui.o: plugingui.c fe-gtk.h ../../config.h ../common/xchat.h \
455	../common/../../config.h ../common/history.h ../common/plugin.h \	455	../common/../../config.h ../common/history.h ../common/plugin.h \
456	../common/text.h ../common/util.h gtkutil.h	456	../common/text.h ../common/util.h gtkutil.h




#include "../pixmaps/globe.xpm"
#include "../pixmaps/server.xpm"
#include "../pixmaps/admin.xpm"
#include "../pixmaps/founder.xpm"
#include "../pixmaps/op.xpm"
#include "../pixmaps/hop.xpm"
#include "../pixmaps/voice.xpm"

GdkPixmap *pix_globe;
GdkPixmap *pix_server;
GdkPixmap *pix_admin;
GdkPixmap *pix_founder;
GdkPixmap *pix_op;
GdkPixmap *pix_hop;
GdkPixmap *pix_voice;

GdkBitmap *mask_globe;
GdkBitmap *mask_server;
GdkBitmap *mask_admin;
GdkBitmap *mask_founder;
GdkBitmap *mask_op;
GdkBitmap *mask_hop;
GdkBitmap *mask_voice;

	pixmap_load_from_data (&pix_globe,		&mask_globe,		globe_xpm);
	pixmap_load_from_data (&pix_server,		&mask_server,		server_xpm);
	pixmap_load_from_data (&pix_admin,		&mask_admin,		admin_xpm);
	pixmap_load_from_data (&pix_founder,		&mask_founder,		founder_xpm);
	pixmap_load_from_data (&pix_op,			&mask_op,			op_xpm);
	pixmap_load_from_data (&pix_hop,			&mask_hop,			hop_xpm);	
	pixmap_load_from_data (&pix_voice,		&mask_voice,		voice_xpm);

Lines 1-5 Link Here

(-)xchat-1.8.9/src/fe-gtk/pixmaps.h (+2 lines)
1	extern GdkPixmap *pix_globe;	1	extern GdkPixmap *pix_globe;
2	extern GdkPixmap *pix_admin;	2	extern GdkPixmap *pix_admin;
		3	extern GdkPixmap *pix_founder;
3	extern GdkPixmap *pix_op;	4	extern GdkPixmap *pix_op;
4	extern GdkPixmap *pix_hop;	5	extern GdkPixmap *pix_hop;
5	extern GdkPixmap *pix_voice;	6	extern GdkPixmap *pix_voice;
Lines 9-14 Link Here
9		10
10	extern GdkBitmap *mask_globe;	11	extern GdkBitmap *mask_globe;
11	extern GdkBitmap *mask_admin;	12	extern GdkBitmap *mask_admin;
		13	extern GdkBitmap *mask_founder;
12	extern GdkBitmap *mask_op;	14	extern GdkBitmap *mask_op;
13	extern GdkBitmap *mask_hop;	15	extern GdkBitmap *mask_hop;
14	extern GdkBitmap *mask_voice;	16	extern GdkBitmap *mask_voice;

Lines 41-46 Link Here

(-)xchat-1.8.9/src/fe-gtk/userlistgui.c (+3 lines)
41	switch (prefix)	41	switch (prefix)
42	{	42	{
43	case '*':	43	case '*':
		44	*mask = mask_founder;
		45	return pix_founder;
		46	case '!':
44	*mask = mask_admin;	47	*mask = mask_admin;
45	return pix_admin;	48	return pix_admin;
46	case '@':	49	case '@':

Lines 3-9 Link Here

(-)xchat-1.8.9/src/pixmaps/admin.xpm (-1 / +1 lines)
3	"7 7 4 1",	3	"7 7 4 1",
4	" c None",	4	" c None",
5	"+ c #000000",	5	"+ c #000000",
6	"@ c #FF4422",	6	"@ c #800080",
7	"# c #FFFFFF",	7	"# c #FFFFFF",
8	" +++ ",	8	" +++ ",
9	" +@@@+ ",	9	" +@@@+ ",

Line 0 Link Here

(-)xchat-1.8.9/src/pixmaps/founder.xpm (+14 lines)
	1	/* XPM */
	2	static char * founder_xpm[] = {
	3	"7 7 4 1",
	4	" c None",
	5	"+ c #000000",
	6	"@ c #FF4422",
	7	"# c #FFFFFF",
	8	" +++ ",
	9	" +@@@+ ",
	10	"+@#@@@#",
	11	"+@@@@@#",
	12	"+@@@@@#",
	13	" +@@@# ",
	14	" ### "};

Return to bug 4776

Lines 34-39 Link Here

(-)xchat-1.8.9/src/fe-gtk/pixmaps.c (+4 lines)
34	#include "../pixmaps/globe.xpm"	34	#include "../pixmaps/globe.xpm"
35	#include "../pixmaps/server.xpm"	35	#include "../pixmaps/server.xpm"
36	#include "../pixmaps/admin.xpm"	36	#include "../pixmaps/admin.xpm"
		37	#include "../pixmaps/founder.xpm"
37	#include "../pixmaps/op.xpm"	38	#include "../pixmaps/op.xpm"
38	#include "../pixmaps/hop.xpm"	39	#include "../pixmaps/hop.xpm"
39	#include "../pixmaps/voice.xpm"	40	#include "../pixmaps/voice.xpm"
Lines 46-51 Link Here
46	GdkPixmap *pix_globe;	47	GdkPixmap *pix_globe;
47	GdkPixmap *pix_server;	48	GdkPixmap *pix_server;
48	GdkPixmap *pix_admin;	49	GdkPixmap *pix_admin;
		50	GdkPixmap *pix_founder;
49	GdkPixmap *pix_op;	51	GdkPixmap *pix_op;
50	GdkPixmap *pix_hop;	52	GdkPixmap *pix_hop;
51	GdkPixmap *pix_voice;	53	GdkPixmap *pix_voice;
Lines 55-60 Link Here
55	GdkBitmap *mask_globe;	57	GdkBitmap *mask_globe;
56	GdkBitmap *mask_server;	58	GdkBitmap *mask_server;
57	GdkBitmap *mask_admin;	59	GdkBitmap *mask_admin;
		60	GdkBitmap *mask_founder;
58	GdkBitmap *mask_op;	61	GdkBitmap *mask_op;
59	GdkBitmap *mask_hop;	62	GdkBitmap *mask_hop;
60	GdkBitmap *mask_voice;	63	GdkBitmap *mask_voice;
Lines 124-129 Link Here
124	pixmap_load_from_data (&pix_globe, &mask_globe, globe_xpm);	127	pixmap_load_from_data (&pix_globe, &mask_globe, globe_xpm);
125	pixmap_load_from_data (&pix_server, &mask_server, server_xpm);	128	pixmap_load_from_data (&pix_server, &mask_server, server_xpm);
126	pixmap_load_from_data (&pix_admin, &mask_admin, admin_xpm);	129	pixmap_load_from_data (&pix_admin, &mask_admin, admin_xpm);
		130	pixmap_load_from_data (&pix_founder, &mask_founder, founder_xpm);
127	pixmap_load_from_data (&pix_op, &mask_op, op_xpm);	131	pixmap_load_from_data (&pix_op, &mask_op, op_xpm);
128	pixmap_load_from_data (&pix_hop, &mask_hop, hop_xpm);	132	pixmap_load_from_data (&pix_hop, &mask_hop, hop_xpm);
129	pixmap_load_from_data (&pix_voice, &mask_voice, voice_xpm);	133	pixmap_load_from_data (&pix_voice, &mask_voice, voice_xpm);