blob: ea9d5f91ab6c127bf29a2d3bb4e99698c027dee9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
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()
|
GitWeb
