Another revision bump for an updated tab completion patch. This should close bug #58666 (Tab completion is quirky in XChat) by David Lloyd <dmlloyd@tds.net>. Added backported patch from upstream CVS which fixes bug #56324 (xchat 2.0.10 cjk preedit string bug) by Jung Tae-young <master@mytears.org>.

6 files changed, 64 insertions, 27 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index d924fec005fc..524f48ca6b25 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.115 2004/07/31 02:22:43 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.116 2004/07/31 12:32:33 swegener Exp $
+
+*xchat-2.0.10-r3 (31 Jul 2004)
+
+  31 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.0.10-preeditstring.patch, -files/xc2010-fixtabcomp2.diff,
+  +files/xc2010-fixtabcomp3.diff, -xchat-2.0.10-r2.ebuild,
+  +xchat-2.0.10-r3.ebuild:
+  Another revision bump for an updated tab completion patch. This should close
+  bug #58666 (Tab completion is quirky in XChat) by David Lloyd
+  <dmlloyd@tds.net>. Added backported patch from upstream CVS which fixes bug
+  #56324 (xchat 2.0.10 cjk preedit string bug) by Jung Tae-young
+  <master@mytears.org>.
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> xchat-2.0.10-r2.ebuild:
   stable on ppc64, bug #57121
diff --git a/net-irc/xchat/files/2.0.10-preeditstring.patch b/net-irc/xchat/files/2.0.10-preeditstring.patch
new file mode 100644
index 000000000000..04e57d051cbc
--- /dev/null
+++ b/net-irc/xchat/files/2.0.10-preeditstring.patch
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /cvsroot/xchat/xchat2/src/fe-gtk/fkeys.c,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- xchat/xchat2/src/fe-gtk/fkeys.c	2004/07/30 16:06:16	1.37
++++ xchat/xchat2/src/fe-gtk/fkeys.c	2004/07/31 05:19:52	1.38
+@@ -1368,9 +1368,14 @@
+ 	    prefix_len, skip_len = 0, is_nick, is_cmd = 0;
+ 	char buf[COMP_BUF], ent[CHANLEN], *postfix = NULL, *result, *ch;
+ 	GList *list = NULL, *tmp_list = NULL;
+-	const char *text = gtk_entry_get_text (GTK_ENTRY (t));
++	const char *text;
+ 	GCompletion *gcomp = NULL;
+ 
++	/* force the IM Context to reset */
++	gtk_editable_set_editable (GTK_EDITABLE (t), FALSE);
++	gtk_editable_set_editable (GTK_EDITABLE (t), TRUE);
++
++	text = GTK_ENTRY (t)->text;
+ 	if (text[0] == 0)
+ 		return 1;
+ 
diff --git a/net-irc/xchat/files/digest-xchat-2.0.10-r2 b/net-irc/xchat/files/digest-xchat-2.0.10-r3
index b794a900c455..b794a900c455 100644
--- a/net-irc/xchat/files/digest-xchat-2.0.10-r2
+++ b/net-irc/xchat/files/digest-xchat-2.0.10-r3
diff --git a/net-irc/xchat/files/xc2010-fixtabcomp2.diff b/net-irc/xchat/files/xc2010-fixtabcomp2.diff
deleted file mode 100644
index 2d4d885aa46b..000000000000
--- a/net-irc/xchat/files/xc2010-fixtabcomp2.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-# Fixes two tab-nick-completion bugs:
-# 1. Crash when you type space-tab
-# 2. Critical glib warning when completion in a dialog-tab.
---- xchat-2.0.10/src/fe-gtk/fkeys.c	2004-07-02 02:28:43.000000000 +1000
-+++ xchat-2.0.10p1/src/fe-gtk/fkeys.c	2004-07-10 01:16:29.000000000 +1000
-@@ -1393,8 +1393,6 @@
- 		{
- 			skip_len++;
- 		}
--		else
--			cursor_pos = g_utf8_pointer_to_offset(text, g_utf8_offset_to_pointer(ch, 1));
- 	}
- 
- 	comp = skip_len;
-@@ -1599,7 +1597,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
diff --git a/net-irc/xchat/files/xc2010-fixtabcomp3.diff b/net-irc/xchat/files/xc2010-fixtabcomp3.diff
new file mode 100644
index 000000000000..47930de6cfba
--- /dev/null
+++ b/net-irc/xchat/files/xc2010-fixtabcomp3.diff
@@ -0,0 +1,25 @@
+# Fixes two tab-nick-completion bugs:
+# 1. Crash when you type space-tab
+# 2. Critical glib warning when completing in a dialog-tab.
+--- xchat-2.0.10/src/fe-gtk/fkeys.c	2004-07-02 02:28:43.000000000 +1000
++++ xchat-2.0.10p3/src/fe-gtk/fkeys.c	2004-07-31 01:55:16.543471104 +1000
+@@ -1386,6 +1386,9 @@
+ 	{
+ 		skip_len++;
+ 		ch = g_utf8_find_prev_char(text, ch);
++		if (!ch)
++			return 2;
++
+ 		cursor_pos = g_utf8_pointer_to_offset(text, ch);
+ 		if (cursor_pos && (g_utf8_get_char_validated(ch, -1) == ':' || 
+ 					g_utf8_get_char_validated(ch, -1) == ',' ||
+@@ -1599,7 +1602,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
diff --git a/net-irc/xchat/xchat-2.0.10-r2.ebuild b/net-irc/xchat/xchat-2.0.10-r3.ebuild
index 79b9b2b17d99..fd1bec0cf5a8 100644
--- a/net-irc/xchat/xchat-2.0.10-r2.ebuild
+++ b/net-irc/xchat/xchat-2.0.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.10-r2.ebuild,v 1.4 2004/07/31 02:22:43 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.10-r3.ebuild,v 1.1 2004/07/31 12:32:33 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,8 +38,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/xc2010-fixtabcomp2.diff
+	epatch ${FILESDIR}/xc2010-fixtabcomp3.diff
 	epatch ${FILESDIR}/xc2010-fixfocus.diff
+	epatch ${FILESDIR}/${PV}-preeditstring.patch
 	use xchatdccserver && epatch ${DISTDIR}/xchat-dccserver-0.4.patch
 }