| 1 |
welp 07/12/02 16:57:39 |
| 2 |
|
| 3 |
Added: 0.11.3-misc-fixes.patch |
| 4 |
Removed: 0.11.3-buddylist-fix.patch |
| 5 |
0.11.3-keyTabswitch-fix.patch |
| 6 |
Log: |
| 7 |
Fix patches wrt bug 200896 |
| 8 |
(Portage version: 2.1.3.19) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-im/gajim/files/0.11.3-misc-fixes.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.11.3-misc-fixes.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.11.3-misc-fixes.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0.11.3-misc-fixes.patch |
| 17 |
=================================================================== |
| 18 |
diff -ur gajim-0.11.3.orig/src/common/contacts.py gajim-0.11.3/src/common/contacts.py |
| 19 |
--- gajim-0.11.3.orig/src/common/contacts.py 2007-11-04 20:52:21.000000000 +0000 |
| 20 |
+++ gajim-0.11.3/src/common/contacts.py 2007-12-02 15:46:27.000000000 +0000 |
| 21 |
@@ -420,6 +420,13 @@ |
| 22 |
return 1 |
| 23 |
if jid2 > jid1: |
| 24 |
return -1 |
| 25 |
+ #If all is the same, compare accounts, they can't be the same |
| 26 |
+ account1 = data1['account'] |
| 27 |
+ account2 = data2['account'] |
| 28 |
+ if account1 > account2: |
| 29 |
+ return 1 |
| 30 |
+ if account2 > account1: |
| 31 |
+ return -1 |
| 32 |
return 0 |
| 33 |
|
| 34 |
def get_metacontacts_big_brother(self, family): |
| 35 |
diff -ur gajim-0.11.3.orig/src/message_window.py gajim-0.11.3/src/message_window.py |
| 36 |
--- gajim-0.11.3.orig/src/message_window.py 2007-12-02 15:42:13.000000000 +0000 |
| 37 |
+++ gajim-0.11.3/src/message_window.py 2007-12-02 15:43:18.000000000 +0000 |
| 38 |
@@ -576,9 +576,12 @@ |
| 39 |
|
| 40 |
def _on_notebook_key_press(self, widget, event): |
| 41 |
control = self.get_active_control() |
| 42 |
- #when we get a key press event in conversation textview, |
| 43 |
+ # Ctrl+PageUP / DOWN has to be handled by notebook |
| 44 |
+ if event.state & gtk.gdk.CONTROL_MASK and event.keyval in ( |
| 45 |
+ gtk keysyms.Page_Down, gtk.keysyms.Page_Up): |
| 46 |
+ return false |
| 47 |
if isinstance(control, ChatControlBase): |
| 48 |
- #we forwarded it to message textview |
| 49 |
+ # we forwarded it to message textview |
| 50 |
control.msg_textview.emit('key_press_event', event) |
| 51 |
control.msg_textview.grab_focus() |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@g.o mailing list |
Archives