changeset f1eb67ab59d1 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f1eb67ab59d1 description: fix some CursorType

diffstat:

src/chat_control.py | 2 +- src/conversation_textview.py | 6 ++++-- src/groupchat_control.py | 4 ++-- src/gui_interface.py | 3 ++- src/htmltextview.py | 10 +++++----- 5 files changed, 14 insertions(+), 11 deletions(-)

diffs (125 lines):

diff -r 442e95b59c28 -r f1eb67ab59d1 src/chat_control.py --- a/src/chat_control.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/chat_control.py Wed Jan 02 17:30:54 2013 +0400 @@ -1293,7 +1293,7 @@ if not self.conv_textview.auto_scrolling: self.conv_textview.stop_scrolling() self.was_at_the_end = (adjustment.get_upper() - adjustment.get_value() \ - - adjustment.page_size) < 18 + - adjustment.get_page_size()) < 18 if self.resource: jid = self.contact.get_full_jid() else: diff -r 442e95b59c28 -r f1eb67ab59d1 src/conversation_textview.py --- a/src/conversation_textview.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/conversation_textview.py Wed Jan 02 17:30:54 2013 +0400 @@ -30,6 +30,7 @@ from threading import Timer # for smooth scrolling

from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GObject @@ -663,16 +664,17 @@ tags = self.tv.get_iter_at_location(x, y).get_tags() if self.change_cursor: self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.XTERM)) + Gdk.Cursor.new(Gdk.CursorType.XTERM)) self.change_cursor = False tag_table = self.tv.get_buffer().get_tag_table() over_line = False xep0184_warning = False + for tag in tags: if tag in (tag_table.lookup('url'), tag_table.lookup('mail'), \ tag_table.lookup('xmpp'), tag_table.lookup('sth_at_sth')): self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.HAND2)) + Gdk.Cursor.new(Gdk.CursorType.HAND2)) self.change_cursor = True elif tag == tag_table.lookup('focus-out-line'): over_line = True diff -r 442e95b59c28 -r f1eb67ab59d1 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/groupchat_control.py Wed Jan 02 17:30:54 2013 +0400 @@ -2583,11 +2583,11 @@ self.tooltip.hide_tooltip()

def show_tooltip(self, contact): - if not self.list_treeview.window: + if not self.list_treeview.get_window(): # control has been destroyed since tooltip was requested return pointer = self.list_treeview.get_pointer() - props = self.list_treeview.get_path_at_pos(pointer[1], pointer[2]) + props = self.list_treeview.get_path_at_pos(pointer[0], pointer[1]) # check if the current pointer is at the same path # as it was before setting the timeout if props and self.tooltip.id == props[0]: diff -r 442e95b59c28 -r f1eb67ab59d1 src/gui_interface.py --- a/src/gui_interface.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/gui_interface.py Wed Jan 02 17:30:54 2013 +0400 @@ -1758,7 +1758,7 @@ self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) - w.window.window.focus(Gtk.get_current_event_time()) + w.window.get_window().focus(Gtk.get_current_event_time()) # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview @@ -2102,6 +2102,7 @@ gc_control = GroupchatControl(mw, contact, account, is_continued=is_continued) mw.new_tab(gc_control) + mw.set_active_tab(gc_control)

def new_private_chat(self, gc_contact, account, session=None): conn = gajim.connections[account] diff -r 442e95b59c28 -r f1eb67ab59d1 src/htmltextview.py --- a/src/htmltextview.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/htmltextview.py Wed Jan 02 17:30:54 2013 +0400 @@ -824,7 +824,7 @@ def __leave_event(self, widget, event): if self._changed_cursor: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.XTERM)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self._changed_cursor = False

def show_tooltip(self, tag): @@ -857,13 +857,13 @@ self.tooltip.hide_tooltip() if not self._changed_cursor and anchor_tags: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.HAND2)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) self._changed_cursor = True self.tooltip.timeout = GObject.timeout_add(500, self.show_tooltip, anchor_tags[0]) elif self._changed_cursor and not anchor_tags: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.XTERM)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self._changed_cursor = False return False

@@ -963,14 +963,14 @@ tags = htmlview.tv.get_iter_at_location(x, y).get_tags() if change_cursor: htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.XTERM)) + Gdk.Cursor.new(Gdk.CursorType.XTERM)) change_cursor = None tag_table = htmlview.tv.get_buffer().get_tag_table() for tag in tags: try: if tag.is_anchor: htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.HAND2)) + Gdk.Cursor.new(Gdk.CursorType.HAND2)) change_cursor = tag elif tag == tag_table.lookup('focus-out-line'): over_line = True