Commits

commits@gajim.org

17632 discussions

gajim: remove call to deprecated get_pointer()
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset cd400898c3d5 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cd400898c3d5 description: remove call to deprecated get_pointer() diffstat: src/conversation_textview.py | 51 ++++++++++++++++++++++--------------------- src/disco.py | 8 ++++-- src/filetransfers_window.py | 21 ++++++++++++------ src/groupchat_control.py | 7 ++++- src/htmltextview.py | 40 ++++++++++++++++++---------------- src/roster_window.py | 6 +++- src/tooltips.py | 3 +- 7 files changed, 77 insertions(+), 59 deletions(-) diffs (truncated from 310 to 300 lines): diff -r e5fe671be26b -r cd400898c3d5 src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/conversation_textview.py Mon Jul 29 14:38:09 2013 +0200 @@ -651,9 +651,11 @@ GLib.idle_add(self.scroll_to_end) def show_xep0184_warning_tooltip(self): - pointer = self.tv.get_pointer() - x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - pointer[1], pointer[2]) + w = self.tv.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] tags = self.tv.get_iter_at_location(x, y).get_tags() tag_table = self.tv.get_buffer().get_tag_table() xep0184_warning = False @@ -663,16 +665,18 @@ break if xep0184_warning and not self.xep0184_warning_tooltip.win: # check if the current pointer is still over the line - position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] - self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates that ' - 'this message has not yet\nbeen received by the remote end. ' - "If this icon stays\nfor a long time, it's likely the message got " - 'lost.'), 8, position[1] + pointer[2]) + position = w.get_origin()[1:] + self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates ' + 'that this message has not yet\nbeen received by the remote ' + "end. If this icon stays\nfor a long time, it's likely the " + 'message got lost.'), 8, position[1] + y) def show_line_tooltip(self): - pointer = self.tv.get_pointer() - x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - pointer[0], pointer[1]) + w = self.tv.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] tags = self.tv.get_iter_at_location(x, y).get_tags() tag_table = self.tv.get_buffer().get_tag_table() over_line = False @@ -682,10 +686,10 @@ break if over_line and not self.line_tooltip.win: # check if the current pointer is still over the line - position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] + position = w.get_origin()[1:] self.line_tooltip.show_tooltip(_('Text below this line is what has ' - 'been said since the\nlast time you paid attention to this group ' - 'chat'), 8, position[1] + pointer[1]) + 'been said since the\nlast time you paid attention to this ' + 'group chat'), 8, position[1] + y) def on_textview_draw(self, widget, ctx): return @@ -719,14 +723,14 @@ """ Change the cursor to a hand when we are over a mail or an url """ - pointer_x, pointer_y = self.tv.get_window(Gtk.TextWindowType.TEXT).\ - get_pointer()[1:3] + w = self.tv.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - pointer_x, pointer_y) + pointer[1], pointer[2]) 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.CursorType.XTERM)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self.change_cursor = False tag_table = self.tv.get_buffer().get_tag_table() over_line = False @@ -735,8 +739,7 @@ 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.CursorType.HAND2)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) self.change_cursor = True elif tag == tag_table.lookup('focus-out-line'): over_line = True @@ -754,14 +757,12 @@ if over_line and not self.line_tooltip.win: self.line_tooltip.timeout = GLib.timeout_add(500, self.show_line_tooltip) - self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) self.change_cursor = True if xep0184_warning and not self.xep0184_warning_tooltip.win: self.xep0184_warning_tooltip.timeout = GLib.timeout_add(500, self.show_xep0184_warning_tooltip) - self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) self.change_cursor = True def clear(self, tv = None): diff -r e5fe671be26b -r cd400898c3d5 src/disco.py --- a/src/disco.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/disco.py Mon Jul 29 14:38:09 2013 +0200 @@ -1272,15 +1272,17 @@ def _show_tooltip(self, state): view = self.window.services_treeview - pointer = view.get_pointer() - props = view.get_path_at_pos(pointer[0], pointer[1]) + w = view.get_window() + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + props = view.get_path_at_pos(pointer[1], pointer[2]) # 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]: # bounding rectangle of coordinates for the cell within the treeview rect = view.get_cell_area(props[0], props[1]) # position of the treeview on the screen - position = view.get_window().get_origin()[1:] + position = w.get_origin()[1:] self.tooltip.show_tooltip(state, rect.height, position[1] + rect.y) else: self.tooltip.hide_tooltip() diff -r e5fe671be26b -r cd400898c3d5 src/filetransfers_window.py --- a/src/filetransfers_window.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/filetransfers_window.py Mon Jul 29 14:38:09 2013 +0200 @@ -753,9 +753,11 @@ self.window.show_all() def on_transfers_list_motion_notify_event(self, widget, event): - pointer = self.tree.get_pointer() + w = self.tree.get_window() + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) props = widget.get_path_at_pos(int(event.x), int(event.y)) - self.height_diff = pointer[1] - int(event.y) + self.height_diff = pointer[2] - int(event.y) if self.tooltip.timeout > 0: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() @@ -780,8 +782,11 @@ self.height_diff = int(event.y) elif self.height_diff is 0: return - pointer = self.tree.get_pointer() - props = self.tree.get_path_at_pos(pointer[0], pointer[1] - self.height_diff) + w = self.tree.get_window() + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + props = self.tree.get_path_at_pos(pointer[1], + pointer[2] - self.height_diff) if self.tooltip.timeout > 0: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() @@ -953,9 +958,11 @@ if self.height_diff == 0: self.tooltip.hide_tooltip() return - pointer = self.tree.get_pointer() - props = self.tree.get_path_at_pos(pointer[0], - pointer[1] - self.height_diff) + w = self.tree.get_window() + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + props = self.tree.get_path_at_pos(pointer[1], + pointer[2] - self.height_diff) # 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 e5fe671be26b -r cd400898c3d5 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/groupchat_control.py Mon Jul 29 14:38:09 2013 +0200 @@ -2685,12 +2685,15 @@ # control has been destroyed since tooltip was requested return pointer = self.list_treeview.get_pointer() - props = self.list_treeview.get_path_at_pos(pointer[0], pointer[1]) + w = self.list_treeview.get_window() + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + props = self.list_treeview.get_path_at_pos(pointer[1], pointer[2]) # 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]: rect = self.list_treeview.get_cell_area(props[0], props[1]) - position = self.list_treeview.get_window().get_origin()[1:] + position = w.get_origin()[1:] self.tooltip.show_tooltip(contact, rect.height, position[1] + rect.y) else: diff -r e5fe671be26b -r cd400898c3d5 src/htmltextview.py --- a/src/htmltextview.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/htmltextview.py Mon Jul 29 14:38:09 2013 +0200 @@ -867,8 +867,11 @@ def show_tooltip(self, tag): if not self.tooltip.win: # check if the current pointer is still over the line - x, y = self.get_window(Gtk.TextWindowType.TEXT).get_pointer()[1:3] - x, y = self.window_to_buffer_coords(Gtk.TextWindowType.TEXT, x, y) + w = self.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] tags = self.get_iter_at_location(x, y).get_tags() is_over_anchor = False for tag_ in tags: @@ -879,13 +882,15 @@ return text = getattr(tag, 'title', False) if text: - pointer = self.get_pointer() - position = self.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:] - self.tooltip.show_tooltip(text, 8, position[1] + pointer[2]) + position = w.get_origin()[1:] + self.tooltip.show_tooltip(text, 8, position[1] + y) def __motion_notify_event(self, widget, event): - x, y = widget.get_window(Gtk.TextWindowType.TEXT).get_pointer()[1:3] - x, y = widget.window_to_buffer_coords(Gtk.TextWindowType.TEXT, x, y) + w = widget.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] tags = widget.get_iter_at_location(x, y).get_tags() anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)] if self.tooltip.timeout != 0: @@ -893,14 +898,12 @@ if not anchor_tags: 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.CursorType.HAND2)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) self._changed_cursor = True self.tooltip.timeout = GLib.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.CursorType.XTERM)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self._changed_cursor = False return False @@ -995,21 +998,20 @@ Change the cursor to a hand when we are over a mail or an url """ global change_cursor - pointer_x, pointer_y = htmlview.tv.get_window(Gtk.TextWindowType.TEXT).\ - get_pointer()[1:3] - x, y = htmlview.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - pointer_x, pointer_y) + w = htmlview.tv.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] 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.CursorType.XTERM)) + w.set_cursor(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.CursorType.HAND2)) + w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) change_cursor = tag elif tag == tag_table.lookup('focus-out-line'): over_line = True diff -r e5fe671be26b -r cd400898c3d5 src/roster_window.py --- a/src/roster_window.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/roster_window.py Mon Jul 29 14:38:09 2013 +0200 @@ -2049,8 +2049,10 @@ vb.set_no_show_all(True) def show_tooltip(self, contact): - pointer = self.tree.get_pointer() - props = self.tree.get_path_at_pos(pointer[0], pointer[1]) + device = self.tree.get_window().get_display().get_device_manager().\ + get_client_pointer() + pointer = self.tree.get_window().get_device_position(device) + props = self.tree.get_path_at_pos(pointer[1], pointer[2]) # 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 e5fe671be26b -r cd400898c3d5 src/tooltips.py --- a/src/tooltips.py Mon Jul 29 13:44:37 2013 +0200 +++ b/src/tooltips.py Mon Jul 29 14:38:09 2013 +0200

1 0

gajim: remove old line
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset d2893efd67be in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d2893efd67be description: remove old line diffstat: src/groupchat_control.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r cd400898c3d5 -r d2893efd67be src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 29 14:38:09 2013 +0200 +++ b/src/groupchat_control.py Mon Jul 29 14:41:02 2013 +0200 @@ -2684,7 +2684,6 @@ if not self.list_treeview.get_window(): # control has been destroyed since tooltip was requested return - pointer = self.list_treeview.get_pointer() w = self.list_treeview.get_window() device = w.get_display().get_device_manager().get_client_pointer() pointer = w.get_device_position(device)

1 0

gajim: GObject -> GLib
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset ad3746bde4b1 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ad3746bde4b1 description: GObject -> GLib diffstat: src/vcard.py | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diffs (98 lines): diff -r d2893efd67be -r ad3746bde4b1 src/vcard.py --- a/src/vcard.py Mon Jul 29 14:41:02 2013 +0200 +++ b/src/vcard.py Mon Jul 29 18:02:48 2013 +0200 @@ -32,7 +32,7 @@ # THIS FILE IS FOR **OTHERS'** PROFILE (when we VIEW their INFO) from gi.repository import Gtk -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Gdk import base64 import time @@ -124,8 +124,8 @@ self.vcard_arrived = False self.os_info_arrived = False self.entity_time_arrived = False - self.update_progressbar_timeout_id = GObject.timeout_add(100, - self.update_progressbar) + self.update_progressbar_timeout_id = GLib.timeout_add(100, + self.update_progressbar) gajim.ged.register_event_handler('version-result-received', ged.GUI1, self.set_os_info) @@ -152,7 +152,7 @@ def on_vcard_information_window_destroy(self, widget): if self.update_progressbar_timeout_id is not None: - GObject.source_remove(self.update_progressbar_timeout_id) + GLib.source_remove(self.update_progressbar_timeout_id) del gajim.interface.instances[self.account]['infos'][self.contact.jid] buffer_ = self.xml.get_object('textview_annotation').get_buffer() annotation = buffer_.get_text(buffer_.get_start_iter(), @@ -175,7 +175,7 @@ self.window.destroy() def on_information_notebook_switch_page(self, widget, page, page_num): - GObject.idle_add(self.xml.get_object('close_button').grab_focus) + GLib.idle_add(self.xml.get_object('close_button').grab_focus) def on_PHOTO_eventbox_button_press_event(self, widget, event): """ @@ -277,7 +277,7 @@ def test_remove_progressbar(self): if self.update_progressbar_timeout_id is not None and \ self.vcard_arrived and self.os_info_arrived and self.entity_time_arrived: - GObject.source_remove(self.update_progressbar_timeout_id) + GLib.source_remove(self.update_progressbar_timeout_id) self.progressbar.hide() self.update_progressbar_timeout_id = None @@ -449,11 +449,11 @@ else: # Request os info if contact is connected if self.gc_contact: j, r = gajim.get_room_and_nick_from_fjid(self.real_jid) - GObject.idle_add(gajim.connections[self.account].request_os_info, - j, r, self.contact.jid) + GLib.idle_add(gajim.connections[self.account].request_os_info, + j, r, self.contact.jid) else: - GObject.idle_add(gajim.connections[self.account].request_os_info, - self.contact.jid, self.contact.resource) + GLib.idle_add(gajim.connections[self.account].request_os_info, + self.contact.jid, self.contact.resource) # do not wait for entity_time if contact is not connected or has error # additional check for observer is needed, as show is offline for him @@ -463,11 +463,11 @@ else: # Request entity time if contact is connected if self.gc_contact: j, r = gajim.get_room_and_nick_from_fjid(self.real_jid) - GObject.idle_add(gajim.connections[self.account].\ - request_entity_time, j, r, self.contact.jid) + GLib.idle_add(gajim.connections[self.account].\ + request_entity_time, j, r, self.contact.jid) else: - GObject.idle_add(gajim.connections[self.account].\ - request_entity_time, self.contact.jid, self.contact.resource) + GLib.idle_add(gajim.connections[self.account].\ + request_entity_time, self.contact.jid, self.contact.resource) self.os_info = {0: {'resource': self.real_resource, 'client': '', 'os': ''}} @@ -482,11 +482,10 @@ uf_resources += '\n' + c.resource + \ _(' resource with priority ') + str(c.priority) if c.show not in ('offline', 'error'): - GObject.idle_add( - gajim.connections[self.account].request_os_info, c.jid, - c.resource) - GObject.idle_add(gajim.connections[self.account].\ - request_entity_time, c.jid, c.resource) + GLib.idle_add(gajim.connections[self.account].\ + request_os_info, c.jid, c.resource) + GLib.idle_add(gajim.connections[self.account].\ + request_entity_time, c.jid, c.resource) self.os_info[i] = {'resource': c.resource, 'client': '', 'os': ''} self.time_info[i] = {'resource': c.resource, 'time': ''}

1 0

gajim: use Gtk.Grid instead of deprecated Gtk.Table in tooltips
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 8683c53f409f in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8683c53f409f description: use Gtk.Grid instead of deprecated Gtk.Table in tooltips diffstat: src/tooltips.py | 131 ++++++++++++++++++++++++++----------------------------- 1 files changed, 63 insertions(+), 68 deletions(-) diffs (truncated from 316 to 300 lines): diff -r ad3746bde4b1 -r 8683c53f409f src/tooltips.py --- a/src/tooltips.py Mon Jul 29 18:02:48 2013 +0200 +++ b/src/tooltips.py Mon Jul 29 18:22:19 2013 +0200 @@ -222,7 +222,10 @@ self.spacer_label = ' ' def create_table(self): - self.table = Gtk.Table(4, 1) + self.table = Gtk.Grid() + self.table.insert_row(0) + self.table.insert_row(0) + self.table.insert_column(0) self.table.set_property('column-spacing', 2) def add_text_row(self, text, col_inc = 0): @@ -232,8 +235,8 @@ self.text_label.set_alignment(0, 0) self.text_label.set_selectable(False) self.text_label.set_markup(text) - self.table.attach(self.text_label, 1 + col_inc, 4, self.current_row, - self.current_row + 1) + self.table.attach(self.text_label, 1 + col_inc, self.current_row, + 3 - col_inc, 1) def get_status_info(self, resource, priority, show, status): str_status = resource + ' (' + str(priority) + ')' @@ -248,10 +251,12 @@ return str_status def add_status_row(self, file_path, show, str_status, status_time=None, - show_lock=False, indent=True): + show_lock=False, indent=True): """ Append a new row with status icon to the table """ + self.table.insert_row(0) + self.table.insert_row(0) self.current_row += 1 state_file = show.replace(' ', '_') files = [] @@ -266,22 +271,18 @@ spacer = Gtk.Label(label=self.spacer_label) image.set_alignment(1, 0.5) if indent: - self.table.attach(spacer, 1, 2, self.current_row, - self.current_row + 1, 0, 0, 0, 0) - self.table.attach(image, 2, 3, self.current_row, - self.current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 2, 0) + self.table.attach(spacer, 1, self.current_row, 1, 1) + self.table.attach(image, 2, self.current_row, 1, 1) status_label = Gtk.Label() status_label.set_markup(str_status) status_label.set_alignment(0, 0) status_label.set_line_wrap(True) - self.table.attach(status_label, 3, 4, self.current_row, - self.current_row + 1, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 0, 0, 0) + self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: lock_image = Gtk.Image() lock_image.set_from_stock(Gtk.STOCK_DIALOG_AUTHENTICATION, - Gtk.IconSize.MENU) - self.table.attach(lock_image, 4, 5, self.current_row, - self.current_row + 1, 0, 0, 0, 0) + Gtk.IconSize.MENU) + self.table.attach(lock_image, 4, self.current_row, 1, 1) class NotificationAreaTooltip(BaseTooltip, StatusTable): """ @@ -322,7 +323,6 @@ self.create_table() accounts = helpers.get_notification_icon_tooltip_dict() - self.table.resize(2, 1) self.fill_table_with_accounts(accounts) self.hbox = Gtk.HBox() self.table.set_property('column-spacing', 1) @@ -349,9 +349,12 @@ if not contact: return self.create_window() - vcard_table = Gtk.Table(3, 1) + vcard_table = Gtk.Grid() + vcard_table.insert_row(0) + vcard_table.insert_row(0) + vcard_table.insert_row(0) + vcard_table.insert_column(0) vcard_table.set_property('column-spacing', 2) - vcard_table.set_homogeneous(False) vcard_current_row = 1 properties = [] @@ -380,17 +383,17 @@ if contact.affiliation != 'none': uf_affiliation = helpers.get_uf_affiliation(contact.affiliation) - uf_affiliation =\ - _('%(owner_or_admin_or_member)s of this group chat') %\ - {'owner_or_admin_or_member': uf_affiliation} + uf_affiliation = \ + _('%(owner_or_admin_or_member)s of this group chat') % \ + {'owner_or_admin_or_member': uf_affiliation} uf_affiliation = self.colorize_affiliation(uf_affiliation) properties.append((uf_affiliation, None)) # Add avatar puny_name = helpers.sanitize_filename(contact.name) puny_room = helpers.sanitize_filename(contact.room_jid) - file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_room, - puny_name)) + file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, + puny_room, puny_name)) if file_: self.avatar_image.set_from_file(file_) pix = self.avatar_image.get_pixbuf() @@ -401,31 +404,27 @@ while properties: property_ = properties.pop(0) vcard_current_row += 1 - vertical_fill = Gtk.AttachOptions.FILL + label = Gtk.Label() if not properties: - vertical_fill |= Gtk.AttachOptions.EXPAND - label = Gtk.Label() + label.set_vexpand(True) label.set_alignment(0, 0) if property_[1]: label.set_markup(property_[0]) - vcard_table.attach(label, 1, 2, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0, 0) + vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() + if not properties: + label.set_vexpand(True) label.set_alignment(0, 0) label.set_markup(property_[1]) label.set_line_wrap(True) - vcard_table.attach(label, 2, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - vertical_fill, 0, 0) + vcard_table.attach(label, 2, vcard_current_row, 1, 1) else: label.set_markup(property_[0]) label.set_line_wrap(True) - vcard_table.attach(label, 1, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0) + vcard_table.attach(label, 1, vcard_current_row, 2, 1) self.avatar_image.set_alignment(0, 0) - vcard_table.attach(self.avatar_image, 3, 4, 2, vcard_current_row + 1, - Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) + vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1) gajim.plugin_manager.gui_extension_point('gc_tooltip_populate', self, contact, vcard_table) self.win.add(vcard_table) @@ -451,7 +450,6 @@ if not contacts or len(contacts) == 0: # Tooltip for merged accounts row accounts = helpers.get_notification_icon_tooltip_dict() - self.table.resize(2, 1) self.spacer_label = '' self.fill_table_with_accounts(accounts) self.win.add(self.table) @@ -459,12 +457,13 @@ # primary contact prim_contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contacts) + contacts) puny_jid = helpers.sanitize_filename(prim_contact.jid) table_size = 3 - file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_jid)) + file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, + puny_jid)) if file_: self.avatar_image.set_from_file(file_) pix = self.avatar_image.get_pixbuf() @@ -473,9 +472,11 @@ table_size = 4 else: self.avatar_image.set_from_pixbuf(None) - vcard_table = Gtk.Table(1,table_size) + vcard_table = Gtk.Grid() + vcard_table.insert_row(0) + for i in range(0, table_size): + vcard_table.insert_column(0) vcard_table.set_property('column-spacing', 2) - vcard_table.set_homogeneous(False) vcard_current_row = 1 properties = [] @@ -508,11 +509,10 @@ if num_resources > 1: properties.append((_('Status: '), ' ')) - transport = gajim.get_transport_name_from_jid( - prim_contact.jid) + transport = gajim.get_transport_name_from_jid(prim_contact.jid) if transport: file_path = os.path.join(helpers.get_transport_path(transport), - '16x16') + '16x16') else: iconset = gajim.config.get('iconset') if not iconset: @@ -525,11 +525,11 @@ for priority in contact_keys: for acontact in contacts_dict[priority]: status_line = self.get_status_info(acontact.resource, - acontact.priority, acontact.show, acontact.status) + acontact.priority, acontact.show, acontact.status) icon_name = self._get_icon_name_for_tooltip(acontact) self.add_status_row(file_path, icon_name, status_line, - acontact.last_status_time) + acontact.last_status_time) properties.append((self.table, None)) else: # only one resource @@ -538,13 +538,14 @@ if not self.check_last_time and self.account: if contact.show == 'offline': if not contact.last_status_time: - gajim.connections[self.account].request_last_status_time( - contact.jid, '') + gajim.connections[self.account].\ + request_last_status_time(contact.jid, '') else: self.check_last_time = contact.last_status_time elif contact.resource: - gajim.connections[self.account].request_last_status_time( - contact.jid, contact.resource) + gajim.connections[self.account].\ + request_last_status_time( + contact.jid, contact.resource) if contact.last_activity_time: self.check_last_time = contact.last_activity_time else: @@ -556,15 +557,15 @@ else: text = _(' since %s') - if time.strftime('%j', time.localtime())== \ - time.strftime('%j', contact.last_status_time): - # it's today, show only the locale hour representation + if time.strftime('%j', time.localtime()) == \ + time.strftime('%j', contact.last_status_time): + # it's today, show only the locale hour representation local_time = time.strftime('%X', - contact.last_status_time) + contact.last_status_time) else: # time.strftime returns locale encoded string local_time = time.strftime('%c', - contact.last_status_time) + contact.last_status_time) text = text % local_time show += text @@ -580,7 +581,8 @@ status = contact.status.strip() if status: # reduce long status - # (no more than 300 chars on line and no more than 5 lines) + # (no more than 300 chars on line and no more than + # 5 lines) # status is wrapped status = helpers.reduce_chars_newlines(status, 300, 5) # escape markup entities. @@ -641,37 +643,30 @@ while properties: property_ = properties.pop(0) vcard_current_row += 1 - vertical_fill = Gtk.AttachOptions.FILL + label = Gtk.Label() if not properties and table_size == 4: - vertical_fill |= Gtk.AttachOptions.EXPAND - label = Gtk.Label() + label.set_vexpand(True) label.set_alignment(0, 0) if property_[1]: label.set_markup(property_[0]) - vcard_table.attach(label, 1, 2, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, - vertical_fill, 0, 0) + vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() + if not properties and table_size == 4: + label.set_vexpand(True) label.set_alignment(0, 0) label.set_markup(property_[1]) label.set_line_wrap(True) - vcard_table.attach(label, 2, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.EXPAND | \ - Gtk.AttachOptions.FILL, vertical_fill, 0, 0) + vcard_table.attach(label, 2, vcard_current_row, 1, 1) else: if isinstance(property_[0], str): label.set_markup(property_[0])

1 0

gajim: fix using generator.next() to next(generator)
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset e5fe671be26b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e5fe671be26b description: fix using generator.next() to next(generator) diffstat: src/disco.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6e3cb29b552b -r e5fe671be26b src/disco.py --- a/src/disco.py Sun Jul 28 20:50:30 2013 +0200 +++ b/src/disco.py Mon Jul 29 13:44:37 2013 +0200 @@ -1130,7 +1130,7 @@ #stop idle_add() yield False loader = fill_partial_rows(items) - gobject.idle_add(loader.next) + GLib.idle_add(next, loader) def _agent_info(self, jid, node, identities, features, data): """

1 0

gajim: move formattings button tooltip to the code to make it mo...
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset f5c74802fc40 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f5c74802fc40 description: move formattings button tooltip to the code to make it more precise. Fixes #7389 diffstat: data/gui/chat_control.ui | 1 - src/chat_control.py | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diffs (31 lines): diff -r a515a8a74125 -r f5c74802fc40 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Jul 28 12:58:15 2013 +0200 +++ b/data/gui/chat_control.ui Mon Jul 29 10:54:48 2013 +0200 @@ -301,7 +301,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> diff -r a515a8a74125 -r f5c74802fc40 src/chat_control.py --- a/src/chat_control.py Sun Jul 28 12:58:15 2013 +0200 +++ b/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 @@ -1755,8 +1755,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) + self._formattings_button.set_tooltip(_( + 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) + if self.contact.supports(NS_XHTML_IM): + self._formattings_button.set_tooltip(_('Formattings are not ' + 'available when GPG is active')) + else: + self._formattings_button.set_tooltip(_('This contact does not ' + 'support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

python-nbxmpp: use get_real_time instead of get_current_time
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 381e96f81981 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=381e96f81981 description: use get_real_time instead of get_current_time diffstat: nbxmpp/idlequeue.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diffs (54 lines): diff -r ed510b99ba0e -r 381e96f81981 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sun Jul 28 20:45:01 2013 +0200 +++ b/nbxmpp/idlequeue.py Sun Jul 28 22:35:47 2013 +0200 @@ -162,9 +162,10 @@ # if program is started from noninteraactive shells stdin is closed and # cannot be forwarded, so we have to keep it open self.pipe = Popen(self._compose_command_args(), stdout=PIPE, - bufsize = 1024, shell = True, stderr = STDOUT, stdin = PIPE) + bufsize=1024, shell=True, stderr=STDOUT, stdin=PIPE) if self.commandtimeout >= 0: - self.endtime = self.idlequeue.current_time() + self.commandtimeout + self.endtime = self.idlequeue.current_time() + \ + (self.commandtimeout * 1e6) self.idlequeue.set_alarm(self.wait_child, 0.1) def _start_posix(self): @@ -242,7 +243,7 @@ """ Set up a new alarm. alarm_cb will be called after specified seconds. """ - alarm_time = self.current_time() + seconds + alarm_time = self.current_time() + (seconds * 1e6) # almost impossible, but in case we have another alarm_cb at this time if alarm_time in self.alarms: self.alarms[alarm_time].append(alarm_cb) @@ -295,7 +296,7 @@ if func: log_txt += ' with function ' + str(func) log.info(log_txt) - timeout = self.current_time() + seconds + timeout = self.current_time() + (seconds * 1e6) if fd in self.read_timeouts: self.read_timeouts[fd][timeout] = func else: @@ -375,7 +376,7 @@ def current_time(self): from time import time - return time() + return time() * 1e6 def _remove_idle(self, fd): """ @@ -515,9 +516,7 @@ Creates a dict, which maps file/pipe/sock descriptor to glib event id """ self.events = {} - # time() is already called in glib, we just get the last value - # overrides IdleQueue.current_time() - self.current_time = GLib.get_current_time + self.current_time = GLib.get_real_time def _add_idle(self, fd, flags): """

1 0

gajim: GObject.* -> GLib.*
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 6e3cb29b552b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6e3cb29b552b description: GObject.* -> GLib.* diffstat: src/adhoc_commands.py | 6 +- src/advanced_configuration_window.py | 6 +- src/cell_renderer_image.py | 6 +- src/chat_control.py | 37 +++++++++++---------- src/common/config.py | 4 +- src/common/connection_handlers.py | 4 +- src/common/jingle_rtp.py | 6 +- src/common/logger.py | 4 +- src/common/resolver.py | 6 +- src/config.py | 25 +++++++------- src/conversation_textview.py | 25 +++++++------- src/dialogs.py | 23 +++++++------ src/disco.py | 34 ++++++++++---------- src/filetransfers_window.py | 26 +++++++-------- src/groupchat_control.py | 17 ++++----- src/gui_interface.py | 44 ++++++++++++------------ src/htmltextview.py | 5 +- src/message_window.py | 9 ++-- src/profile_window.py | 27 ++++++++------- src/roster_window.py | 43 ++++++++++++------------ src/search_window.py | 12 +++--- src/tooltips.py | 61 ++++++++++++++++------------------- 22 files changed, 215 insertions(+), 215 deletions(-) diffs (truncated from 1710 to 300 lines): diff -r 07b350a36f36 -r 6e3cb29b552b src/adhoc_commands.py --- a/src/adhoc_commands.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/adhoc_commands.py Sun Jul 28 20:50:30 2013 +0200 @@ -25,7 +25,7 @@ # FIXME: think if we need caching command list. it may be wrong if there will # be entities that often change the list, it may be slow to fetch it every time -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Gtk import nbxmpp @@ -555,14 +555,14 @@ return True # important to keep callback be called back! # 12 times per second (80 miliseconds) - self.pulse_id = GObject.timeout_add(80, callback) + self.pulse_id = GLib.timeout_add(80, callback) def remove_pulsing(self): """ Stop pulsing, useful when especially when removing widget """ if self.pulse_id: - GObject.source_remove(self.pulse_id) + GLib.source_remove(self.pulse_id) self.pulse_id = None # handling xml stanzas diff -r 07b350a36f36 -r 6e3cb29b552b src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/advanced_configuration_window.py Sun Jul 28 20:50:30 2013 +0200 @@ -25,7 +25,7 @@ from gi.repository import Gtk import gtkgui_helpers -from gi.repository import GObject +from gi.repository import GLib from common import gajim from common import helpers @@ -51,12 +51,12 @@ timeout = [None] def f(*args, **kwargs): if timeout[0] is not None: - GObject.source_remove(timeout[0]) + GLib.source_remove(timeout[0]) timeout[0] = None def timeout_func(): func(*args, **kwargs) timeout[0] = None - timeout[0] = GObject.timeout_add(int(1000.0 / rate), timeout_func) + timeout[0] = GLib.timeout_add(int(1000.0 / rate), timeout_func) return f return decorator diff -r 07b350a36f36 -r 6e3cb29b552b src/cell_renderer_image.py --- a/src/cell_renderer_image.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/cell_renderer_image.py Sun Jul 28 20:50:30 2013 +0200 @@ -77,7 +77,7 @@ if model: model.foreach(self.func, (image, tree)) if self.redraw: - GObject.timeout_add(iter_.get_delay_time(), + GLib.timeout_add(iter_.get_delay_time(), self.animation_timeout, tree, image) elif image in self.iters: del self.iters[image] @@ -95,8 +95,8 @@ timeval.tv_sec = GLib.get_current_time() iter_ = animation.get_iter(timeval) self.iters[self.image] = iter_ - GObject.timeout_add(iter_.get_delay_time(), - self.animation_timeout, widget, self.image) + GLib.timeout_add(iter_.get_delay_time(), self.animation_timeout, + widget, self.image) pix = self.iters[self.image].get_pixbuf() elif self.image.get_storage_type() == Gtk.ImageType.PIXBUF: diff -r 07b350a36f36 -r 6e3cb29b552b src/chat_control.py --- a/src/chat_control.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/chat_control.py Sun Jul 28 20:50:30 2013 +0200 @@ -34,6 +34,7 @@ from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GObject +from gi.repository import GLib import gtkgui_helpers import gui_menu_builder import message_control @@ -1286,7 +1287,7 @@ visible_rect = textview.get_visible_rect() # scroll only if expected end is not visible if end_rect.y >= (visible_rect.y + visible_rect.height + diff_y): - self.scroll_to_end_id = GObject.idle_add(self.scroll_to_end_iter, + self.scroll_to_end_id = GLib.idle_add(self.scroll_to_end_iter, textview) def scroll_to_end_iter(self, textview): @@ -1482,7 +1483,7 @@ """ # make the last message visible, when changing to "full view" if not state: - GObject.idle_add(self.conv_textview.scroll_to_end_iter) + GLib.idle_add(self.conv_textview.scroll_to_end_iter) widget.set_no_show_all(state) if state: @@ -2048,8 +2049,8 @@ if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h: # wait for 0.5 sec in case we leave earlier if self.show_bigger_avatar_timeout_id is not None: - GObject.source_remove(self.show_bigger_avatar_timeout_id) - self.show_bigger_avatar_timeout_id = GObject.timeout_add(500, + GLib.source_remove(self.show_bigger_avatar_timeout_id) + self.show_bigger_avatar_timeout_id = GLib.timeout_add(500, self.show_bigger_avatar, widget) def on_avatar_eventbox_leave_notify_event(self, widget, event): @@ -2058,7 +2059,7 @@ """ # did we add a timeout? if yes remove it if self.show_bigger_avatar_timeout_id is not None: - GObject.source_remove(self.show_bigger_avatar_timeout_id) + GLib.source_remove(self.show_bigger_avatar_timeout_id) self.show_bigger_avatar_timeout_id = None def on_avatar_eventbox_button_press_event(self, widget, event): @@ -2100,9 +2101,9 @@ self.mouse_over_in_last_30_secs = True def _schedule_activity_timers(self): - self.possible_paused_timeout_id = GObject.timeout_add_seconds(5, + self.possible_paused_timeout_id = GLib.timeout_add_seconds(5, self.check_for_possible_paused_chatstate, None) - self.possible_inactive_timeout_id = GObject.timeout_add_seconds(30, + self.possible_inactive_timeout_id = GLib.timeout_add_seconds(30, self.check_for_possible_inactive_chatstate, None) def update_ui(self): @@ -2162,7 +2163,7 @@ name = i18n.direction_mark + _( '%(nickname)s from group chat %(room_name)s') % \ {'nickname': name, 'room_name': self.room_name} - name = i18n.direction_mark + GObject.markup_escape_text(name) + name = i18n.direction_mark + GLib.markup_escape_text(name) # We know our contacts nick, but if another contact has the same nick # in another account we need to also display the account. @@ -2179,7 +2180,7 @@ if other_contact_.get_shown_name() == \ self.contact.get_shown_name(): acct_info = i18n.direction_mark + ' (%s)' % \ - GObject.markup_escape_text(self.account) + GLib.markup_escape_text(self.account) break status = contact.status @@ -2189,7 +2190,7 @@ status_reduced = helpers.reduce_chars_newlines(status, max_lines=1) else: status_reduced = '' - status_escaped = GObject.markup_escape_text(status_reduced) + status_escaped = GLib.markup_escape_text(status_reduced) font_attrs, font_attrs_small = self.get_font_attrs() st = gajim.config.get('displayed_chat_state_notifications') @@ -2407,8 +2408,8 @@ chatstate_to_send = 'active' contact.our_chatstate = 'active' - GObject.source_remove(self.possible_paused_timeout_id) - GObject.source_remove(self.possible_inactive_timeout_id) + GLib.source_remove(self.possible_paused_timeout_id) + GLib.source_remove(self.possible_inactive_timeout_id) self._schedule_activity_timers() def _on_sent(msg_stanza, message, encrypted, xhtml, label, old_txt): @@ -2671,7 +2672,7 @@ name = self.contact.get_shown_name() if self.resource: name += '/' + self.resource - label_str = GObject.markup_escape_text(name) + label_str = GLib.markup_escape_text(name) if num_unread: # if unread, text in the label becomes bold label_str = '<b>' + unread + label_str + '</b>' return (label_str, color) @@ -2809,8 +2810,8 @@ self.session.control = None # Disconnect timer callbacks - GObject.source_remove(self.possible_paused_timeout_id) - GObject.source_remove(self.possible_inactive_timeout_id) + GLib.source_remove(self.possible_paused_timeout_id) + GLib.source_remove(self.possible_inactive_timeout_id) # Remove bigger avatar window if self.bigger_avatar_window: self.bigger_avatar_window.destroy() @@ -2893,8 +2894,8 @@ else: self.send_chatstate('active', self.contact) self.reset_kbd_mouse_timeout_vars() - GObject.source_remove(self.possible_paused_timeout_id) - GObject.source_remove(self.possible_inactive_timeout_id) + GLib.source_remove(self.possible_paused_timeout_id) + GLib.source_remove(self.possible_inactive_timeout_id) self._schedule_activity_timers() else: self.send_chatstate('inactive', self.contact) @@ -3479,6 +3480,6 @@ self.info_bar.set_no_show_all(True) self.info_bar.hide() # show next one? - GObject.idle_add(self._info_bar_show_message) + GLib.idle_add(self._info_bar_show_message) break i += 1 diff -r 07b350a36f36 -r 6e3cb29b552b src/common/config.py --- a/src/common/config.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/common/config.py Sun Jul 28 20:50:30 2013 +0200 @@ -36,7 +36,7 @@ import re import copy from common import defs -from gi.repository import GObject +from gi.repository import GLib ( OPT_TYPE, @@ -802,7 +802,7 @@ def _timeout_save(self): if self.save_timeout_id: return - self.save_timeout_id = GObject.timeout_add(1000, self._really_save) + self.save_timeout_id = GLib.timeout_add(1000, self._really_save) def __init__(self): #init default values diff -r 07b350a36f36 -r 6e3cb29b552b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/common/connection_handlers.py Sun Jul 28 20:50:30 2013 +0200 @@ -33,7 +33,7 @@ import sys import operator import hashlib -from gi.repository import GObject +from gi.repository import GLib from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) @@ -560,7 +560,7 @@ self.discover_ft_proxies() gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) - GObject.timeout_add_seconds(10, self.discover_servers) + GLib.timeout_add_seconds(10, self.discover_servers) elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: if iq_obj.getType() != 'error': self.privacy_rules_supported = True diff -r 07b350a36f36 -r 6e3cb29b552b src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/common/jingle_rtp.py Sun Jul 28 20:50:30 2013 +0200 @@ -17,7 +17,7 @@ from collections import deque -from gi.repository import GObject +from gi.repository import GLib import socket import nbxmpp @@ -130,13 +130,13 @@ events = deque(events) self._dtmf_running = True self._start_dtmf(events.popleft()) - GObject.timeout_add(500, self._next_dtmf, events) + GLib.timeout_add(500, self._next_dtmf, events) def _next_dtmf(self, events): self._stop_dtmf() if events: self._start_dtmf(events.popleft()) - GObject.timeout_add(500, self._next_dtmf, events) + GLib.timeout_add(500, self._next_dtmf, events) else: self._dtmf_running = False diff -r 07b350a36f36 -r 6e3cb29b552b src/common/logger.py --- a/src/common/logger.py Sun Jul 28 20:50:11 2013 +0200 +++ b/src/common/logger.py Sun Jul 28 20:50:30 2013 +0200 @@ -34,7 +34,7 @@ import datetime from gzip import GzipFile from io import BytesIO -from gi.repository import GObject +from gi.repository import GLib from common import exceptions from common import gajim @@ -177,7 +177,7 @@

1 0

gajim: fix a few things for gtk3
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 0d750b6ca15a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0d750b6ca15a description: fix a few things for gtk3 diffstat: src/common/connection_handlers.py | 2 +- src/common/i18n.py | 2 +- src/common/proxy65_manager.py | 2 +- src/gajim.py | 2 +- src/groupchat_control.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diffs (62 lines): diff -r 4344e00225ac -r 0d750b6ca15a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/connection_handlers.py Sun Jul 28 19:38:49 2013 +0200 @@ -42,7 +42,7 @@ import nbxmpp from common import caps_cache as capscache -from pep import LOCATION_DATA +from common.pep import LOCATION_DATA from common import helpers from common import gajim from common import exceptions diff -r 4344e00225ac -r 0d750b6ca15a src/common/i18n.py --- a/src/common/i18n.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/i18n.py Sun Jul 28 19:38:49 2013 +0200 @@ -28,7 +28,7 @@ import unicodedata # May be changed after GTK is imported -direction_mark = u'\u200F' +direction_mark = '\u200F' def paragraph_direction_mark(text): """ diff -r 4344e00225ac -r 0d750b6ca15a src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/proxy65_manager.py Sun Jul 28 19:38:49 2013 +0200 @@ -166,7 +166,7 @@ self.state = S_FINISHED def _on_connect_failure(self): - print 'connection failed: ' + self.host + print('connection failed: ' + self.host) self.state = S_FINISHED self.host = None self.port = 0 diff -r 4344e00225ac -r 0d750b6ca15a src/gajim.py --- a/src/gajim.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/gajim.py Sun Jul 28 19:38:49 2013 +0200 @@ -210,7 +210,7 @@ warnings.filterwarnings(action='ignore') if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR: - i18n.direction_mark = u'\u200E' + i18n.direction_mark = '\u200E' pritext = '' from common import exceptions diff -r 4344e00225ac -r 0d750b6ca15a src/groupchat_control.py --- a/src/groupchat_control.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/groupchat_control.py Sun Jul 28 19:38:49 2013 +0200 @@ -2808,8 +2808,8 @@ if fjid in connection.blocked_contacts: return max_order = connection.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': u'jid', - 'action': u'deny', 'value' : fjid, 'child': ['message', 'iq', + new_rule = {'order': str(max_order + 1), 'type': 'jid', + 'action': 'deny', 'value' : fjid, 'child': ['message', 'iq', 'presence-out']} connection.blocked_list.append(new_rule) connection.blocked_contacts.append(fjid)

1 0

gajim: fix encoding issue
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 07b350a36f36 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=07b350a36f36 description: fix encoding issue diffstat: src/common/socks5.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 0d750b6ca15a -r 07b350a36f36 src/common/socks5.py --- a/src/common/socks5.py Sun Jul 28 19:38:49 2013 +0200 +++ b/src/common/socks5.py Sun Jul 28 20:50:11 2013 +0200 @@ -875,9 +875,9 @@ Get sha of sid + Initiator jid + Target jid """ if self.file_props.is_a_proxy: - return hashlib.sha1('%s%s%s' % (self.sid, - self.file_props.proxy_sender, self.file_props.proxy_receiver) - ).hexdigest() + return hashlib.sha1(('%s%s%s' % (self.sid, + self.file_props.proxy_sender, self.file_props.proxy_receiver)).\ + encode('utf-8')).hexdigest() return hashlib.sha1(('%s%s%s' % (self.sid, self.initiator, self.target)).encode('utf-8')).hexdigest()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits