Commits

commits@gajim.org

17632 discussions

gajim: temporary solution instead Gtk.binding_entry_add_signal(s...
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 5d6e2cfad8a4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5d6e2cfad8a4 description: temporary solution instead Gtk.binding_entry_add_signal(send by enter) diffstat: src/chat_control.py | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diffs (46 lines): diff -r 05d3e7471118 -r 5d6e2cfad8a4 src/chat_control.py --- a/src/chat_control.py Fri Jan 11 16:37:10 2013 +0400 +++ b/src/chat_control.py Fri Jan 11 18:33:54 2013 +0400 @@ -771,6 +771,42 @@ if event.keyval == Gdk.KEY_Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True +################################################################################ + # temporary solution instead Gtk.binding_entry_add_signal + if event.keyval == Gdk.KEY_Return or \ + event.keyval == Gdk.KEY_KP_Enter: # ENTER + message_textview = widget + message_buffer = message_textview.get_buffer() + start_iter, end_iter = message_buffer.get_bounds() + message = message_buffer.get_text(start_iter, end_iter, False) + xhtml = self.msg_textview.get_xhtml() + + if gajim.config.get('send_on_ctrl_enter'): + if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER + send_message = True + else: + end_iter = message_buffer.get_end_iter() + message_buffer.insert_at_cursor('\n') + send_message = False + + else: # send on Enter, do newline on Ctrl Enter + if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER + end_iter = message_buffer.get_end_iter() + message_buffer.insert_at_cursor('\n') + send_message = False + else: # ENTER + send_message = True + + if gajim.connections[self.account].connected < 2 and send_message: + # we are not connected + dialogs.ErrorDialog(_('A connection is not available'), + _('Your message can not be sent until you are connected.')) + send_message = False + + if send_message: + self.send_message(message, xhtml=xhtml) # send the message + return True +################################################################################ return False def _on_message_textview_mykeypress_event(self, widget, event_keyval,

1 0

gajim: fix change font in html, wrong import
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 05d3e7471118 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05d3e7471118 description: fix change font in html, wrong import diffstat: src/chat_control.py | 3 ++- src/common/stanza_session.py | 2 +- src/message_textview.py | 9 +++------ 3 files changed, 6 insertions(+), 8 deletions(-) diffs (69 lines): diff -r 9461cfb2b066 -r 05d3e7471118 src/chat_control.py --- a/src/chat_control.py Fri Jan 11 13:43:46 2013 +0400 +++ b/src/chat_control.py Fri Jan 11 16:37:10 2013 +0400 @@ -1102,7 +1102,8 @@ def on_font_menuitem_activale(self, widget): font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) - font_dialog.connect('response', self.msg_textview.font_set) + start, finish = self.msg_textview.get_active_iters() + font_dialog.connect('response', self.msg_textview.font_set, start, finish) font_dialog.show_all() def on_actions_button_clicked(self, widget): diff -r 9461cfb2b066 -r 05d3e7471118 src/common/stanza_session.py --- a/src/common/stanza_session.py Fri Jan 11 13:43:46 2013 +0400 +++ b/src/common/stanza_session.py Fri Jan 11 16:37:10 2013 +0400 @@ -45,7 +45,7 @@ from Crypto.PublicKey import RSA from common import dh - from . import secrets + import secrets XmlDsig = 'http://www.w3.org/2000/09/xmldsig#' diff -r 9461cfb2b066 -r 05d3e7471118 src/message_textview.py --- a/src/message_textview.py Fri Jan 11 13:43:46 2013 +0400 +++ b/src/message_textview.py Fri Jan 11 16:37:10 2013 +0400 @@ -147,7 +147,6 @@ _buffer.remove_all_tags(start, finish) def color_set(self, widget, response): - print (response) if response == -6 or response == -4: widget.destroy() return @@ -174,13 +173,11 @@ _buffer.apply_tag_by_name(tag_name, start, finish) - def font_set(self, widget, response): + def font_set(self, widget, response, start, finish): if response == -6 or response == -4: widget.destroy() return - _buffer = self.get_buffer() - font = widget.get_font() font_desc = widget.get_font_desc() family = font_desc.get_family() @@ -191,6 +188,8 @@ widget.destroy() + _buffer = self.get_buffer() + tag_name = 'font' + font if not tag_name in self.fonts_tags: tagFont = _buffer.create_tag(tag_name) @@ -201,8 +200,6 @@ self.end_tags[tag_name] = '</span>' self.fonts_tags.append(tag_name) - start, finish = self.get_active_iters() - for tag in self.fonts_tags: _buffer.remove_tag_by_name(tag, start, finish)

1 0

gajim: fix caps
by Denis Fomin 11 Jan '13

11 Jan '13

changeset acd4bc0ae799 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=acd4bc0ae799 description: fix caps diffstat: src/common/logger.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r e56c75b2913b -r acd4bc0ae799 src/common/logger.py --- a/src/common/logger.py Fri Jan 11 01:54:53 2013 +0400 +++ b/src/common/logger.py Fri Jan 11 13:34:49 2013 +0400 @@ -926,13 +926,13 @@ # if there's a need to do more gzip, put that to a function string = BytesIO() gzip = GzipFile(fileobj=string, mode='w') - gzip.write(data) + gzip.write(data.encode('utf-8')) gzip.close() data = string.getvalue() self.cur.execute(''' INSERT INTO caps_cache ( hash_method, hash, data, last_seen ) VALUES (?, ?, ?, ?); - ''', (hash_method, hash_, buffer(data), int(time.time()))) + ''', (hash_method, hash_, memoryview(data), int(time.time()))) # (1) -- note above self._timeout_commit()

1 0

gajim: fix char counter in single message dialog
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 9461cfb2b066 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9461cfb2b066 description: fix char counter in single message dialog diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r acd4bc0ae799 -r 9461cfb2b066 src/dialogs.py --- a/src/dialogs.py Fri Jan 11 13:34:49 2013 +0400 +++ b/src/dialogs.py Fri Jan 11 13:43:46 2013 +0400 @@ -3124,7 +3124,7 @@ def update_char_counter(self, widget): characters_no = self.message_tv_buffer.get_char_count() - self.count_chars_label.set_text(characters_no) + self.count_chars_label.set_text(str(characters_no)) def send_single_message(self): if gajim.connections[self.account].connected <= 1:

1 0

gajim: fix html
by Denis Fomin 10 Jan '13

10 Jan '13

changeset e56c75b2913b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e56c75b2913b description: fix html diffstat: src/conversation_textview.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r 19932f201272 -r e56c75b2913b src/conversation_textview.py --- a/src/conversation_textview.py Fri Jan 11 01:53:09 2013 +0400 +++ b/src/conversation_textview.py Fri Jan 11 01:54:53 2013 +0400 @@ -999,6 +999,8 @@ after *last* special text, so we can print it in print_conversation_line() """ + if not otext: + return buffer_ = self.tv.get_buffer() if other_tags: insert_tags_func = buffer_.insert_with_tags_by_name @@ -1378,7 +1380,7 @@ self.tv.display_html(xhtml, self) return except Exception as e: - gajim.log.debug('Error processing xhtml' + str(e)) + gajim.log.debug('Error processing xhtml: ' + str(e)) gajim.log.debug('with |' + xhtml + '|') # /me is replaced by name if name is given

1 0

gajim: fix html
by Denis Fomin 10 Jan '13

10 Jan '13

changeset 19932f201272 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19932f201272 description: fix html diffstat: src/common/helpers.py | 3 ++- src/htmltextview.py | 26 ++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diffs (94 lines): diff -r 90c5ed47435f -r 19932f201272 src/common/helpers.py --- a/src/common/helpers.py Thu Jan 10 19:47:57 2013 +0100 +++ b/src/common/helpers.py Fri Jan 11 01:53:09 2013 +0400 @@ -1460,7 +1460,8 @@ """ Download an image. This function should be launched in a separated thread. """ - mem, alt = '', '' + mem = b'' + alt = '' # Wait maximum 5s for connection socket.setdefaulttimeout(5) try: diff -r 90c5ed47435f -r 19932f201272 src/htmltextview.py --- a/src/htmltextview.py Thu Jan 10 19:47:57 2013 +0100 +++ b/src/htmltextview.py Fri Jan 11 01:53:09 2013 +0400 @@ -238,7 +238,7 @@ def _get_current_attributes(self): attrs = self.textview.get_default_attributes() self.iter.backward_char() - self.iter.get_attributes(attrs) + attrs = (self.iter.get_attributes())[1] self.iter.forward_char() return attrs @@ -265,7 +265,8 @@ frac = val/100 if font_relative: attrs = self._get_current_attributes() - font_size = attrs.font.get_size() / Pango.SCALE + if not attrs.font: + font_size = self.get_font_size() callback(frac*display_resolution*font_size, *args) elif block_relative: # CSS says 'Percentage values: refer to width of the closest @@ -297,14 +298,17 @@ elif value.endswith('em'): # ems, the width of the element's font attrs = self._get_current_attributes() - font_size = attrs.font.get_size() / Pango.SCALE + if not attrs.font: + font_size = self.get_font_size() callback(get_val()*display_resolution*font_size, *args) elif value.endswith('ex'): # x-height, ~ the height of the letter 'x' # FIXME: figure out how to calculate this correctly # for now 'em' size is used as approximation + attrs = self._get_current_attributes() - font_size = attrs.font.get_size() / Pango.SCALE + if not attrs.font: + font_size = self.get_font_size() callback(get_val()*display_resolution*font_size, *args) elif value.endswith('px'): # pixels @@ -359,13 +363,14 @@ pass else: attrs = self._get_current_attributes() - tag.set_property('scale', scale / attrs.font_scale) + if attrs.font_scale ==0: + tag.set_property('scale', scale) return if value == 'smaller': - tag.set_property('scale', Pango.SCALE_SMALL) + tag.set_property('scale', 0.8333333333333) return if value == 'larger': - tag.set_property('scale', Pango.SCALE_LARGE) + tag.set_property('scale', 1.2) return # font relative (5 ~ 4pt, 110 ~ 72pt) self._parse_length(value, True, False, 5, 110,self.__parse_font_size_cb, @@ -758,7 +763,7 @@ self.list_counters.append(0) elif name == 'li': if self.list_counters[-1] is None: - li_head = unichr(0x2022) + li_head = chr(0x2022) else: self.list_counters[-1] += 1 li_head = '%i.' % self.list_counters[-1] @@ -820,6 +825,11 @@ self._jump_line() self._end_span() + def get_font_size(self): + context = self.conv_textview.tv.get_style_context() + font = context.get_font(Gtk.StateType.NORMAL) + return font.get_size() / Pango.SCALE + class HtmlTextView(Gtk.TextView): def __init__(self):

1 0

gajim: fix traceback
by Yann Leboulanger 10 Jan '13

10 Jan '13

changeset 90c5ed47435f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90c5ed47435f description: fix traceback diffstat: src/common/contacts.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r e1a438c50641 -r 90c5ed47435f src/common/contacts.py --- a/src/common/contacts.py Thu Jan 10 17:16:53 2013 +0100 +++ b/src/common/contacts.py Thu Jan 10 19:47:57 2013 +0100 @@ -490,12 +490,12 @@ return c def iter_contacts(self): - for jid in self._contacts.keys(): + for jid in list(self._contacts.keys()): for contact in self._contacts[jid][:]: yield contact def get_jid_list(self): - return self._contacts.keys() + return list(self._contacts.keys()) def get_contacts_jid_list(self): return [jid for jid, contact in self._contacts.items() if not

1 0

gajim: remove <ping> child in ping reply. Fixes #7286
by Yann Leboulanger 10 Jan '13

10 Jan '13

changeset 4cf7302158c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4cf7302158c0 description: remove <ping> child in ping reply. Fixes #7286 diffstat: src/common/connection_handlers.py | 3 +++ src/roster_window.py | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (33 lines): diff -r f007eddf81e9 -r 4cf7302158c0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 30 19:48:17 2012 +0100 +++ b/src/common/connection_handlers.py Thu Jan 10 17:21:05 2013 +0100 @@ -1829,6 +1829,9 @@ if not self.connection or self.connected < 2: return iq_obj = obj.stanza.buildReply('result') + q = iq_obj.getTag('ping') + if q: + iq_obj.delChild(q) self.connection.send(iq_obj) def _PrivacySetCB(self, con, iq_obj): diff -r f007eddf81e9 -r 4cf7302158c0 src/roster_window.py --- a/src/roster_window.py Sun Dec 30 19:48:17 2012 +0100 +++ b/src/roster_window.py Thu Jan 10 17:21:05 2013 +0100 @@ -3428,6 +3428,8 @@ """ When a key is pressed in the treeviews """ + print 'tree', event.keyval + print gtk.gdk.keyval_to_unicode(event.keyval) self.tooltip.hide_tooltip() if event.keyval == gtk.keysyms.Escape: if self.rfilter_enabled: @@ -4402,6 +4404,7 @@ self.disable_rfilter() def on_rfilter_entry_key_press_event(self, widget, event): + print 'rfilter', event.keyval if event.keyval == gtk.keysyms.Escape: self.disable_rfilter() elif event.keyval == gtk.keysyms.Return:

1 0

gajim: remove <ping> child in ping reply. Fixes #7286
by Yann Leboulanger 10 Jan '13

10 Jan '13

changeset 1cceb6e48a2d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cceb6e48a2d description: remove <ping> child in ping reply. Fixes #7286 diffstat: src/common/connection_handlers.py | 3 +++ src/roster_window.py | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (33 lines): diff -r df25d88761a8 -r 1cceb6e48a2d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jan 06 15:11:34 2013 +0100 +++ b/src/common/connection_handlers.py Thu Jan 10 17:21:05 2013 +0100 @@ -1833,6 +1833,9 @@ if not self.connection or self.connected < 2: return iq_obj = obj.stanza.buildReply('result') + q = iq_obj.getTag('ping') + if q: + iq_obj.delChild(q) self.connection.send(iq_obj) def _PrivacySetCB(self, con, iq_obj): diff -r df25d88761a8 -r 1cceb6e48a2d src/roster_window.py --- a/src/roster_window.py Sun Jan 06 15:11:34 2013 +0100 +++ b/src/roster_window.py Thu Jan 10 17:21:05 2013 +0100 @@ -3457,6 +3457,8 @@ """ When a key is pressed in the treeviews """ + print 'tree', event.keyval + print gtk.gdk.keyval_to_unicode(event.keyval) self.tooltip.hide_tooltip() if event.keyval == gtk.keysyms.Escape: if self.rfilter_enabled: @@ -4435,6 +4437,7 @@ self.disable_rfilter() def on_rfilter_entry_key_press_event(self, widget, event): + print 'rfilter', event.keyval if event.keyval == gtk.keysyms.Escape: self.disable_rfilter() elif event.keyval == gtk.keysyms.Return:

1 0

gajim: remove wrong call to decode()
by Yann Leboulanger 10 Jan '13

10 Jan '13

changeset e1a438c50641 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e1a438c50641 description: remove wrong call to decode() diffstat: src/chat_control.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diffs (31 lines): diff -r 5a76b123af99 -r e1a438c50641 src/chat_control.py --- a/src/chat_control.py Thu Jan 10 00:43:20 2013 +0400 +++ b/src/chat_control.py Thu Jan 10 17:16:53 2013 +0100 @@ -268,7 +268,6 @@ end = _buffer.get_iter_at_mark(position) text = _buffer.get_text(start, end, False) - text = text.decode('utf8') splitted = text.split() @@ -785,8 +784,7 @@ message_textview = widget message_buffer = message_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() - message = message_buffer.get_text(start_iter, end_iter, False).decode( - 'utf-8') + message = message_buffer.get_text(start_iter, end_iter, False) xhtml = self.msg_textview.get_xhtml() # construct event instance from binding @@ -1366,8 +1364,7 @@ # whatever is already typed start_iter = msg_buf.get_start_iter() end_iter = msg_buf.get_end_iter() - self.orig_msg = msg_buf.get_text(start_iter, end_iter, False).decode( - 'utf-8') + self.orig_msg = msg_buf.get_text(start_iter, end_iter, False) pos += -1 if direction == 'up' else +1 if pos == -1: return

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