wok-6.x annotate xchat/stuff/xc286-smallfixes.diff @ rev 5377

Up: cmake (2.8.1)
author Christopher Rogers <slaxemulator@gmail.com>
date Sat May 01 02:44:28 2010 +0000 (2010-05-01)
parents
children
rev   line source
erjo@1987 1 #
erjo@1987 2 # Various small fixes from CVS that are considered safe to apply to 2.8.6.
erjo@1987 3 #
erjo@1987 4 --- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100
erjo@1987 5 +++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000
erjo@1987 6 @@ -886,7 +886,6 @@
erjo@1987 7 set_showval (session *sess, const struct prefs *var, char *tbuf)
erjo@1987 8 {
erjo@1987 9 int len, dots, j;
erjo@1987 10 - static const char *offon[] = { "OFF", "ON" };
erjo@1987 11
erjo@1987 12 len = strlen (var->name);
erjo@1987 13 memcpy (tbuf, var->name, len);
erjo@1987 14 @@ -909,8 +908,10 @@
erjo@1987 15 *((int *) &prefs + var->offset));
erjo@1987 16 break;
erjo@1987 17 case TYPE_BOOL:
erjo@1987 18 - sprintf (tbuf + len, "\0033:\017 %s\n", offon[
erjo@1987 19 - *((int *) &prefs + var->offset)]);
erjo@1987 20 + if (*((int *) &prefs + var->offset))
erjo@1987 21 + sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
erjo@1987 22 + else
erjo@1987 23 + sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
erjo@1987 24 break;
erjo@1987 25 }
erjo@1987 26 PrintText (sess, tbuf);
erjo@1987 27 --- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000
erjo@1987 28 +++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000
erjo@1987 29 @@ -32,7 +32,7 @@
erjo@1987 30
erjo@1987 31 #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
erjo@1987 32
erjo@1987 33 -channel_options chanopt[] =
erjo@1987 34 +static const channel_options chanopt[] =
erjo@1987 35 {
erjo@1987 36 {"alert_beep", "BEEP", S_F(alert_beep)},
erjo@1987 37 {"alert_taskbar", NULL, S_F(alert_taskbar)},
erjo@1987 38 --- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100
erjo@1987 39 +++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000
erjo@1987 40 @@ -509,6 +509,8 @@
erjo@1987 41 list = g_slist_nth (net->servlist, net->selected);
erjo@1987 42 if (!list)
erjo@1987 43 list = net->servlist;
erjo@1987 44 + if (!list)
erjo@1987 45 + return;
erjo@1987 46 ircserv = list->data;
erjo@1987 47
erjo@1987 48 /* incase a protocol switch is added to the servlist gui */
erjo@1987 49 --- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100
erjo@1987 50 +++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000
erjo@1987 51 @@ -216,7 +216,7 @@
erjo@1987 52 static void
erjo@1987 53 scrollback_save (session *sess, char *text)
erjo@1987 54 {
erjo@1987 55 - char buf[1024];
erjo@1987 56 + char buf[512 * 4];
erjo@1987 57 time_t stamp;
erjo@1987 58 int len;
erjo@1987 59
erjo@1987 60 @@ -266,7 +266,7 @@
erjo@1987 61 scrollback_load (session *sess)
erjo@1987 62 {
erjo@1987 63 int fh;
erjo@1987 64 - char buf[1024];
erjo@1987 65 + char buf[512 * 4];
erjo@1987 66 char *text;
erjo@1987 67 time_t stamp;
erjo@1987 68 int lines;