xchat-lite-noplugin/xc286-smallfixes.diff

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