From 2ad69bb9a7c1e23cfb051e568331afca2beb79a0 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Oct 23 2007 19:47:03 +0000
Subject: Sync from devel/F-8:

- drop obsolete xchat-2.4.4-unrealize.patch (fixed upstream for a while)
- drop broken xchat-2.4.3-im_context_filter_keypress.patch (#295331)

---

diff --git a/xchat-2.4.3-im_context_filter_keypress.patch b/xchat-2.4.3-im_context_filter_keypress.patch
deleted file mode 100644
index eb30d9d..0000000
--- a/xchat-2.4.3-im_context_filter_keypress.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xchat-2.4.3/src/fe-gtk/fkeys.c.orig	2005-03-10 20:32:28.000000000 -1000
-+++ xchat-2.4.3/src/fe-gtk/fkeys.c	2005-05-15 21:03:27.000000000 -1000
-@@ -288,6 +288,11 @@
- 				kb->next = keys_root;
- 				keys_root = kb;
- 			}
-+			/* make sure this key event is filtered in the Input Method. */
-+			if (gtk_im_context_filter_keypress (GTK_ENTRY (wid)->im_context, evt)) {
-+				GTK_ENTRY (wid)->need_im_reset = TRUE;
-+				return TRUE;
-+			}
- 			/* Run the function */
- 			n = key_actions[kb->action].handler (wid, evt, kb->data1,
- 															 kb->data2, sess);
diff --git a/xchat-2.4.4-unrealize.patch b/xchat-2.4.4-unrealize.patch
deleted file mode 100644
index 4ba06d3..0000000
--- a/xchat-2.4.4-unrealize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xchat-2.4.4/src/fe-gtk/xtext.c.unrealize	2005-08-17 14:53:54.719272000 -0400
-+++ xchat-2.4.4/src/fe-gtk/xtext.c	2005-08-17 14:54:16.680288000 -0400
-@@ -911,6 +911,8 @@
- {
- 	backend_deinit (GTK_XTEXT (widget));
- 
-+	gdk_window_set_user_data (widget->window, NULL);
-+
- 	if (parent_class->unrealize)
- 		(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
- }
diff --git a/xchat.spec b/xchat.spec
index 555351b..371f44a 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   5%{?dist}
+Release:   6%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -22,9 +22,6 @@ Patch1: xc284-improvescrollback.diff
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.patch
-Patch33: xchat-2.4.3-im_context_filter_keypress.patch
-# filed as 1262423 in the xchat bug tracker
-Patch34: xchat-2.4.4-unrealize.patch
 # see #241923
 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 
@@ -71,8 +68,6 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
 %patch19 -p0 -b .freenode
-%patch33 -p1 -b .im_context_filter_keypress
-%patch34 -p1 -b .unrealize
 %patch35 -p1 -b .tray-icon
 
 %build
@@ -162,6 +157,10 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Sat Oct 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.4-6
+- drop obsolete xchat-2.4.4-unrealize.patch (fixed upstream for a while)
+- drop broken xchat-2.4.3-im_context_filter_keypress.patch (#295331)
+
 * Wed Sep 26 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.4-5
 - apply xc284-improvescrollback.diff from upstream