SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xchat/stuff/xc286-smallfixes.diff	Sun Sep 26 17:02:23 2010 +0000
     1.3 @@ -0,0 +1,68 @@
     1.4 +#
     1.5 +# Various small fixes from CVS that are considered safe to apply to 2.8.6.
     1.6 +#
     1.7 +--- xchat-2.8.6/src/common/cfgfiles.c	2008-02-05 21:02:47.000000000 +1100
     1.8 ++++ xchat-2.8.6p1/src/common/cfgfiles.c	2008-06-15 13:45:43.000000000 +1000
     1.9 +@@ -886,7 +886,6 @@
    1.10 + set_showval (session *sess, const struct prefs *var, char *tbuf)
    1.11 + {
    1.12 + 	int len, dots, j;
    1.13 +-	static const char *offon[] = { "OFF", "ON" };
    1.14 + 
    1.15 + 	len = strlen (var->name);
    1.16 + 	memcpy (tbuf, var->name, len);
    1.17 +@@ -909,8 +908,10 @@
    1.18 + 					*((int *) &prefs + var->offset));
    1.19 + 		break;
    1.20 + 	case TYPE_BOOL:
    1.21 +-		sprintf (tbuf + len, "\0033:\017 %s\n", offon[
    1.22 +-					*((int *) &prefs + var->offset)]);
    1.23 ++		if (*((int *) &prefs + var->offset))
    1.24 ++			sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
    1.25 ++		else
    1.26 ++			sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
    1.27 + 		break;
    1.28 + 	}
    1.29 + 	PrintText (sess, tbuf);
    1.30 +--- xchat-2.8.6/src/common/chanopt.c	2008-06-10 22:00:55.000000000 +1000
    1.31 ++++ xchat-2.8.6p1/src/common/chanopt.c	2008-06-15 13:48:04.000000000 +1000
    1.32 +@@ -32,7 +32,7 @@
    1.33 + 
    1.34 + #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
    1.35 + 
    1.36 +-channel_options chanopt[] =
    1.37 ++static const channel_options chanopt[] =
    1.38 + {
    1.39 + 	{"alert_beep", "BEEP", S_F(alert_beep)},
    1.40 + 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
    1.41 +--- xchat-2.8.6/src/common/servlist.c	2008-04-01 19:22:34.000000000 +1100
    1.42 ++++ xchat-2.8.6p1/src/common/servlist.c	2008-06-15 13:57:41.000000000 +1000
    1.43 +@@ -509,6 +509,8 @@
    1.44 + 	list = g_slist_nth (net->servlist, net->selected);
    1.45 + 	if (!list)
    1.46 + 		list = net->servlist;
    1.47 ++	if (!list)
    1.48 ++		return;
    1.49 + 	ircserv = list->data;
    1.50 + 
    1.51 + 	/* incase a protocol switch is added to the servlist gui */
    1.52 +--- xchat-2.8.6/src/common/text.c	2008-03-28 13:20:04.000000000 +1100
    1.53 ++++ xchat-2.8.6p1/src/common/text.c	2008-06-15 13:59:59.000000000 +1000
    1.54 +@@ -216,7 +216,7 @@
    1.55 + static void
    1.56 + scrollback_save (session *sess, char *text)
    1.57 + {
    1.58 +-	char buf[1024];
    1.59 ++	char buf[512 * 4];
    1.60 + 	time_t stamp;
    1.61 + 	int len;
    1.62 + 
    1.63 +@@ -266,7 +266,7 @@
    1.64 + scrollback_load (session *sess)
    1.65 + {
    1.66 + 	int fh;
    1.67 +-	char buf[1024];
    1.68 ++	char buf[512 * 4];
    1.69 + 	char *text;
    1.70 + 	time_t stamp;
    1.71 + 	int lines;