rpms/xchat/devel xc286-smallfixes.diff, NONE, 1.1 xchat.spec, 1.92, 1.93

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5640/devel

Modified Files:
	xchat.spec 
Added Files:
	xc286-smallfixes.diff 
Log Message:
* Mon Jul 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-2
- apply xc286-smallfixes.diff from upstream

xc286-smallfixes.diff:

--- NEW FILE xc286-smallfixes.diff ---
#
# Various small fixes from CVS that are considered safe to apply to 2.8.6.
#
--- xchat-2.8.6/src/common/cfgfiles.c	2008-02-05 21:02:47.000000000 +1100
+++ xchat-2.8.6p1/src/common/cfgfiles.c	2008-06-15 13:45:43.000000000 +1000
@@ -886,7 +886,6 @@
 set_showval (session *sess, const struct prefs *var, char *tbuf)
 {
 	int len, dots, j;
-	static const char *offon[] = { "OFF", "ON" };
 
 	len = strlen (var->name);
 	memcpy (tbuf, var->name, len);
@@ -909,8 +908,10 @@
 					*((int *) &prefs + var->offset));
 		break;
 	case TYPE_BOOL:
-		sprintf (tbuf + len, "\0033:\017 %s\n", offon[
-					*((int *) &prefs + var->offset)]);
+		if (*((int *) &prefs + var->offset))
+			sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
+		else
+			sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
 		break;
 	}
 	PrintText (sess, tbuf);
--- xchat-2.8.6/src/common/chanopt.c	2008-06-10 22:00:55.000000000 +1000
+++ xchat-2.8.6p1/src/common/chanopt.c	2008-06-15 13:48:04.000000000 +1000
@@ -32,7 +32,7 @@
 
 #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
 
-channel_options chanopt[] =
+static const channel_options chanopt[] =
 {
 	{"alert_beep", "BEEP", S_F(alert_beep)},
 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
--- xchat-2.8.6/src/common/servlist.c	2008-04-01 19:22:34.000000000 +1100
+++ xchat-2.8.6p1/src/common/servlist.c	2008-06-15 13:57:41.000000000 +1000
@@ -509,6 +509,8 @@
 	list = g_slist_nth (net->servlist, net->selected);
 	if (!list)
 		list = net->servlist;
+	if (!list)
+		return;
 	ircserv = list->data;
 
 	/* incase a protocol switch is added to the servlist gui */
--- xchat-2.8.6/src/common/text.c	2008-03-28 13:20:04.000000000 +1100
+++ xchat-2.8.6p1/src/common/text.c	2008-06-15 13:59:59.000000000 +1000
@@ -216,7 +216,7 @@
 static void
 scrollback_save (session *sess, char *text)
 {
-	char buf[1024];
+	char buf[512 * 4];
 	time_t stamp;
 	int len;
 
@@ -266,7 +266,7 @@
 scrollback_load (session *sess)
 {
 	int fh;
-	char buf[1024];
+	char buf[512 * 4];
 	char *text;
 	time_t stamp;
 	int lines;


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- xchat.spec	15 Jun 2008 12:52:14 -0000	1.92
+++ xchat.spec	14 Jul 2008 20:28:27 -0000	1.93
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Patches 0-9 reserved for official xchat.org patches
+Patch0: xc286-smallfixes.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -64,6 +65,8 @@
 
 %prep
 %setup -q
+# Various small fixes from CVS that are considered safe to apply to 2.8.6.
+%patch0 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -158,6 +161,9 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Mon Jul 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-2
+- apply xc286-smallfixes.diff from upstream
+
 * Sun Jun 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-1
 - update to 2.8.6
 - drop upstream patches (already applied in 2.8.6)