From 47cc804db904e96aaaa4f823b16808c9c3a8b1a4 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Thu, 8 Jul 2004 19:00:10 +0000
Subject: * Fix crash when typing <space> <tab> * Fix a Glib warning when using
 completion in dialogs

Obtained from:	http://xchat.org/files/source/2.0/patches/
---
 irc/xchat2/Makefile               |  1 +
 irc/xchat2/files/patch-fixtabcomp | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 irc/xchat2/files/patch-fixtabcomp

(limited to 'irc')

diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index ba8835d67c45..861644c23974 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchat2
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/2.0/
 DISTNAME=	xchat-${PORTVERSION}
diff --git a/irc/xchat2/files/patch-fixtabcomp b/irc/xchat2/files/patch-fixtabcomp
new file mode 100644
index 000000000000..0f96282fb27e
--- /dev/null
+++ b/irc/xchat2/files/patch-fixtabcomp
@@ -0,0 +1,24 @@
+# Fixes two tab-nick-completion bugs:
+# 1. Crash when you type space-tab
+# 2. Critical glib warning when completion in a dialog-tab.
+--- src/fe-gtk/fkeys.c	2004-07-01 18:28:43.000000000 +0200
++++ src/fe-gtk/fkeys.c	2004-07-05 12:19:56.000000000 +0200
+@@ -1394,7 +1394,7 @@
+ 			skip_len++;
+ 		}
+ 		else
+-			cursor_pos = g_utf8_pointer_to_offset(text, g_utf8_offset_to_pointer(ch, 1));
++			return 2;
+ 	}
+ 
+ 	comp = skip_len;
+@@ -1599,7 +1599,8 @@
+ 		gtk_entry_set_text (GTK_ENTRY (t), buf);
+ 		gtk_editable_set_position (GTK_EDITABLE (t), g_utf8_pointer_to_offset(buf, buf + cursor_pos));
+ 	}
+-	g_completion_free(gcomp);
++	if (gcomp)
++		g_completion_free(gcomp);
+ 	return 2;
+ }
+ #undef COMP_BUF
-- 
cgit v1.2.3