diff options
author | Sven Wegener <swegener@gentoo.org> | 2004-12-05 03:14:45 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2004-12-05 03:14:45 +0000 |
commit | 073f06228f231e3d5a14d8a1ac96a3a9da2d618d (patch) | |
tree | f2aca9287609c35f997da4246806db45ba8d6ca2 /net-irc | |
parent | initial import bug #47812. (Manifest recommit) (diff) | |
download | gentoo-2-073f06228f231e3d5a14d8a1ac96a3a9da2d618d.tar.gz gentoo-2-073f06228f231e3d5a14d8a1ac96a3a9da2d618d.tar.bz2 gentoo-2-073f06228f231e3d5a14d8a1ac96a3a9da2d618d.zip |
Remove old patches too.
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/xchat/ChangeLog | 7 | ||||
-rw-r--r-- | net-irc/xchat/files/2.0.10-preeditstring.patch | 23 | ||||
-rw-r--r-- | net-irc/xchat/files/xc2010-fixfocus.diff | 17 | ||||
-rw-r--r-- | net-irc/xchat/files/xc2010-fixtabcomp3.diff | 25 |
4 files changed, 6 insertions, 66 deletions
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog index 26add549b12d..74bf2539ec09 100644 --- a/net-irc/xchat/ChangeLog +++ b/net-irc/xchat/ChangeLog @@ -1,6 +1,11 @@ # 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.139 2004/12/05 03:11:06 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.140 2004/12/05 03:14:45 swegener Exp $ + + 05 Dec 2004; Sven Wegener <swegener@gentoo.org> + -files/2.0.10-preeditstring.patch, -files/xc2010-fixfocus.diff, + -files/xc2010-fixtabcomp3.diff: + Remove old patches too. 05 Dec 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.0.10-r3.ebuild, -xchat-2.0.8-r1.ebuild: diff --git a/net-irc/xchat/files/2.0.10-preeditstring.patch b/net-irc/xchat/files/2.0.10-preeditstring.patch deleted file mode 100644 index 04e57d051cbc..000000000000 --- a/net-irc/xchat/files/2.0.10-preeditstring.patch +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -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/xc2010-fixfocus.diff b/net-irc/xchat/files/xc2010-fixfocus.diff deleted file mode 100644 index 318750af5074..000000000000 --- a/net-irc/xchat/files/xc2010-fixfocus.diff +++ /dev/null @@ -1,17 +0,0 @@ -# Fixes rare crash on window focus (only on some obscure WindowManagers) ---- xchat-2.0.10/src/fe-gtk/maingui.c 2004-06-29 15:27:24.000000000 +1000 -+++ xchat-2.0.10p1/src/fe-gtk/maingui.c 2004-07-13 01:11:02.000000000 +1000 -@@ -2131,8 +2142,11 @@ - mg_tabwin_focus_cb (GtkWindow * win, GdkEventFocus *event, gpointer userdata) - { - current_sess = current_tab; -- gtk_xtext_check_marker_visibility(GTK_XTEXT (current_sess->gui->xtext)); -- plugin_emit_dummy_print (current_sess, "Focus Window"); -+ if (current_sess) -+ { -+ gtk_xtext_check_marker_visibility (GTK_XTEXT (current_sess->gui->xtext)); -+ plugin_emit_dummy_print (current_sess, "Focus Window"); -+ } - return FALSE; - } - diff --git a/net-irc/xchat/files/xc2010-fixtabcomp3.diff b/net-irc/xchat/files/xc2010-fixtabcomp3.diff deleted file mode 100644 index 47930de6cfba..000000000000 --- a/net-irc/xchat/files/xc2010-fixtabcomp3.diff +++ /dev/null @@ -1,25 +0,0 @@ -# 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 |