Fix patches wrt bug 200896

Package-Manager: portage-2.1.3.19

6 files changed, 55 insertions, 53 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 2fa76f583dd7..67d0182f1313 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.61 2007/11/28 16:05:03 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.62 2007/12/02 16:57:38 welp Exp $
+
+  02 Dec 2007; Peter Weller <welp@gentoo.org>
+  -files/0.11.3-buddylist-fix.patch, -files/0.11.3-keyTabswitch-fix.patch,
+  +files/0.11.3-misc-fixes.patch, gajim-0.11.3-r1.ebuild:
+  Fix patches wrt bug 200896
 
   28 Nov 2007; <welp@gentoo.org> files/0.11.3-buddylist-fix.patch,
   files/0.11.3-keyTabswitch-fix.patch:
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index f6b051273d75..2c423b1f8f9c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,11 +1,7 @@
-AUX 0.11.3-buddylist-fix.patch 477 RMD160 2adf195711d9e325df2fcf1efec213b8ef58e08f SHA1 780537723aea9f69cbc583c874fc5365d5330585 SHA256 a94755b0402ae45462175326bf0c9f3e9b0afad5ae1d17ef0e6b6c34cbebc2f7
-MD5 eb399b174946d9ad4e2bbccbe2dff433 files/0.11.3-buddylist-fix.patch 477
-RMD160 2adf195711d9e325df2fcf1efec213b8ef58e08f files/0.11.3-buddylist-fix.patch 477
-SHA256 a94755b0402ae45462175326bf0c9f3e9b0afad5ae1d17ef0e6b6c34cbebc2f7 files/0.11.3-buddylist-fix.patch 477
-AUX 0.11.3-keyTabswitch-fix.patch 772 RMD160 909bbbd2a5c5a3216b86e9aa1bf1ba4a3054ac56 SHA1 e241897325a068dade7631224b5ec639e89a031d SHA256 ca0246c0e3178bd208255d3cce1010e5ef724259f1773cbbffa90f356c4452dc
-MD5 814a8bad97032fe212c5290fec604e6e files/0.11.3-keyTabswitch-fix.patch 772
-RMD160 909bbbd2a5c5a3216b86e9aa1bf1ba4a3054ac56 files/0.11.3-keyTabswitch-fix.patch 772
-SHA256 ca0246c0e3178bd208255d3cce1010e5ef724259f1773cbbffa90f356c4452dc files/0.11.3-keyTabswitch-fix.patch 772
+AUX 0.11.3-misc-fixes.patch 1401 RMD160 64729180efd245c29e1f0498c3e6d3c60e4611ba SHA1 4450385e058b02d9e4fd31322b31b1b099a8a9a8 SHA256 9ba6350e29816109db3c43e876af73831e7dae8b2359b3eba9432a5bd45e9db1
+MD5 ef09d16bc30abbd922dfb6f5aa18614c files/0.11.3-misc-fixes.patch 1401
+RMD160 64729180efd245c29e1f0498c3e6d3c60e4611ba files/0.11.3-misc-fixes.patch 1401
+SHA256 9ba6350e29816109db3c43e876af73831e7dae8b2359b3eba9432a5bd45e9db1 files/0.11.3-misc-fixes.patch 1401
 DIST gajim-0.11.1.tar.gz 3665819 RMD160 2491d39c1beec479a32b2efbf31b2a6dc1f96b6e SHA1 5a11a26725559e0d60a17bbaaa416ef5670c42b7 SHA256 41fead82d54f5d0d91eef161a6e0fcaa673aec3430c2d3c9f04ea91917d5c8f2
 DIST gajim-0.11.2.tar.gz 3883045 RMD160 2dfd21750ccaf753066e920affa2e07016788ad6 SHA1 2869bff89df38f109a23915a4fb9a88840c59379 SHA256 e3d5ece412742b0b47311523f64f6ad739813f6e6a540c87efe15e2826e20b5a
 DIST gajim-0.11.3.tar.gz 3933538 RMD160 0cfd21e3e74d24a604fac25cffd1ce9954554dbc SHA1 05bb10476dc8d4b00f47c338e9d94097158fc236 SHA256 91e4f2ab0471885c9575163cc47fe664cc55863084e4ce12aef773b3de168dfa
@@ -21,18 +17,18 @@ EBUILD gajim-0.11.2.ebuild 2641 RMD160 b53ced9738990d55a5a0c3e186cb46a00b099fbf
 MD5 35fb1877c9fea5ea19a1ded6c0f7edfd gajim-0.11.2.ebuild 2641
 RMD160 b53ced9738990d55a5a0c3e186cb46a00b099fbf gajim-0.11.2.ebuild 2641
 SHA256 2290a8a0e62ff473b7087e8a2f70e805efe574cbc408e53bc91af71bb67d4e8d gajim-0.11.2.ebuild 2641
-EBUILD gajim-0.11.3-r1.ebuild 2807 RMD160 f9278437127a9595ab312632eaca9bd20704aa1d SHA1 1ae6359468922edc809645035abe86de74563bae SHA256 135409225d3f1b2b2736b4d3297ad066f0f84d492a86f0e4080c1f993c6caddc
-MD5 dd12c173a4a4acc31a47b08ffec7b1c2 gajim-0.11.3-r1.ebuild 2807
-RMD160 f9278437127a9595ab312632eaca9bd20704aa1d gajim-0.11.3-r1.ebuild 2807
-SHA256 135409225d3f1b2b2736b4d3297ad066f0f84d492a86f0e4080c1f993c6caddc gajim-0.11.3-r1.ebuild 2807
+EBUILD gajim-0.11.3-r1.ebuild 2753 RMD160 037c1392566f8e8757ea5f60d6b2c445333a357f SHA1 ddd79857c364943ab242c19d932e0bd8caf0ef5c SHA256 1c20397be8c1b4b8306d68a359eb0832c8cd23bca8cbef8e81e98df74cc5883f
+MD5 de817258e83fc519c8c8ee1644f803ab gajim-0.11.3-r1.ebuild 2753
+RMD160 037c1392566f8e8757ea5f60d6b2c445333a357f gajim-0.11.3-r1.ebuild 2753
+SHA256 1c20397be8c1b4b8306d68a359eb0832c8cd23bca8cbef8e81e98df74cc5883f gajim-0.11.3-r1.ebuild 2753
 EBUILD gajim-0.11.3.ebuild 2668 RMD160 5c00ad42e184394a22368a834255fb0458a814e1 SHA1 ed3a20842f92f7bd8343ac6dc13ef62d72335b0a SHA256 6e81d18a5914e45ce72611ed10bb28fb54b50c9ab540951d3cb992e240f0ef8f
 MD5 302a0e48af4791396c334c5eccb8d654 gajim-0.11.3.ebuild 2668
 RMD160 5c00ad42e184394a22368a834255fb0458a814e1 gajim-0.11.3.ebuild 2668
 SHA256 6e81d18a5914e45ce72611ed10bb28fb54b50c9ab540951d3cb992e240f0ef8f gajim-0.11.3.ebuild 2668
-MISC ChangeLog 8623 RMD160 3de632f5870d6bb4d338e8bfe2a7570646e901d1 SHA1 f03928d887857d4cfc0a63bb227c539b24798925 SHA256 cf3f73bcf37f8e5bdbbfeba67a1020e7ce08a1fc2436b24facee4846c98ca11b
-MD5 f5ba3a9a0bb81be5d143e14cb11313b6 ChangeLog 8623
-RMD160 3de632f5870d6bb4d338e8bfe2a7570646e901d1 ChangeLog 8623
-SHA256 cf3f73bcf37f8e5bdbbfeba67a1020e7ce08a1fc2436b24facee4846c98ca11b ChangeLog 8623
+MISC ChangeLog 8832 RMD160 ee54fc9450144b94a61896ce791bc198e9392e1a SHA1 3fa0ed1582da94eec70952e8295756edef7ecea5 SHA256 3505f4f9fc5c67da045f7206d13dc3a765e48ed7ee0443fdc10712755824f2cc
+MD5 30dd5a469fe31b7b117b41961c5f8825 ChangeLog 8832
+RMD160 ee54fc9450144b94a61896ce791bc198e9392e1a ChangeLog 8832
+SHA256 3505f4f9fc5c67da045f7206d13dc3a765e48ed7ee0443fdc10712755824f2cc ChangeLog 8832
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369
diff --git a/net-im/gajim/files/0.11.3-buddylist-fix.patch b/net-im/gajim/files/0.11.3-buddylist-fix.patch
deleted file mode 100644
index d802d91baff8..000000000000
--- a/net-im/gajim/files/0.11.3-buddylist-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/common/contacts.py

-===================================================================

---- src/common/contacts.py (revision 8719)

-+++ src/common/contacts.py (revision 9019)

-@@ -421,4 +421,11 @@

- 		if jid2 > jid1:

- 			return -1

-+		# If all is the same, compare accounts, they can't be the same

-+		account1 = data1['account']

-+		account2 = data2['account']

-+		if account1 > account2:

-+			return 1

-+		if account2 > account1:

-+			return -1

- 		return 0

- 

diff --git a/net-im/gajim/files/0.11.3-keyTabswitch-fix.patch b/net-im/gajim/files/0.11.3-keyTabswitch-fix.patch
deleted file mode 100644
index 55d7754bca8b..000000000000
--- a/net-im/gajim/files/0.11.3-keyTabswitch-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/message_window.py

-===================================================================

---- src/message_window.py (revision 8991)

-+++ src/message_window.py (revision 9020)

-@@ -577,7 +577,10 @@

- 	def _on_notebook_key_press(self, widget, event):

- 		control = self.get_active_control()

--		#when we get a key press event in conversation textview,

-+		# Ctrl+PageUP / DOWN has to be handled by notebook

-+		if event.state & gtk.gdk.CONTROL_MASK and event.keyval in (

-+		gtk.keysyms.Page_Down, gtk.keysyms.Page_Up):

-+			return False

- 		if isinstance(control, ChatControlBase):

--			#we forwarded it to message textview

-+			# we forwarded it to message textview

- 			control.msg_textview.emit('key_press_event', event)

- 			control.msg_textview.grab_focus()

diff --git a/net-im/gajim/files/0.11.3-misc-fixes.patch b/net-im/gajim/files/0.11.3-misc-fixes.patch
new file mode 100644
index 000000000000..a138841f65d7
--- /dev/null
+++ b/net-im/gajim/files/0.11.3-misc-fixes.patch
@@ -0,0 +1,35 @@
+diff -ur gajim-0.11.3.orig/src/common/contacts.py gajim-0.11.3/src/common/contacts.py
+--- gajim-0.11.3.orig/src/common/contacts.py	2007-11-04 20:52:21.000000000 +0000
++++ gajim-0.11.3/src/common/contacts.py	2007-12-02 15:46:27.000000000 +0000
+@@ -420,6 +420,13 @@
+ 			return 1
+ 		if jid2 > jid1:
+ 			return -1
++    #If all is the same, compare accounts, they can't be the same
++		account1 = data1['account']
++		account2 = data2['account']
++		if account1 > account2:
++			return 1
++		if account2 > account1:
++			return -1
+ 		return 0
+ 
+ 	def get_metacontacts_big_brother(self, family):
+diff -ur gajim-0.11.3.orig/src/message_window.py gajim-0.11.3/src/message_window.py
+--- gajim-0.11.3.orig/src/message_window.py	2007-12-02 15:42:13.000000000 +0000
++++ gajim-0.11.3/src/message_window.py	2007-12-02 15:43:18.000000000 +0000
+@@ -576,9 +576,12 @@
+ 
+ 	def _on_notebook_key_press(self, widget, event):
+ 		control = self.get_active_control()
+-		#when we get a key press event in conversation textview,
++		# Ctrl+PageUP / DOWN has to be handled by notebook
++		if event.state & gtk.gdk.CONTROL_MASK and event.keyval in (
++		gtk keysyms.Page_Down, gtk.keysyms.Page_Up):
++			return false
+ 		if isinstance(control, ChatControlBase):
+-			#we forwarded it to message textview
++			# we forwarded it to message textview
+ 			control.msg_textview.emit('key_press_event', event)
+ 			control.msg_textview.grab_focus()
+ 
diff --git a/net-im/gajim/gajim-0.11.3-r1.ebuild b/net-im/gajim/gajim-0.11.3-r1.ebuild
index 2d9f52527dd4..e659f80b839f 100644
--- a/net-im/gajim/gajim-0.11.3-r1.ebuild
+++ b/net-im/gajim/gajim-0.11.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.3-r1.ebuild,v 1.1 2007/11/25 13:12:37 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.3-r1.ebuild,v 1.2 2007/12/02 16:57:38 welp Exp $
 
 inherit multilib python eutils
 
@@ -68,8 +68,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-buddylist-fix.patch"
-	epatch "${FILESDIR}/${PV}-keyTabswitch-fix.patch"
+	epatch "${FILESDIR}/${PV}-misc-fixes.patch"
 }
 
 src_compile() {