Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: correctly detect when GnomeKeyring is not installed
by Yann Leboulanger 20 Feb '13

20 Feb '13

changeset 4a8b3a6a0731 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a8b3a6a0731 description: correctly detect when GnomeKeyring is not installed diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0052f87c1e25 -r 4a8b3a6a0731 src/common/passwords.py --- a/src/common/passwords.py Mon Feb 18 20:52:04 2013 +0100 +++ b/src/common/passwords.py Wed Feb 20 20:13:08 2013 +0100 @@ -202,7 +202,7 @@ gir = __import__('gi.repository', globals(), locals(), ['GnomeKeyring'], 0) GnomeKeyring = gir.GnomeKeyring - except ImportError: + except (ImportError, AttributeError): pass else: global USER_HAS_GNOMEKEYRING

1 0

gajim: handle the case when user press cancell at gnome keyring ...
by Yann Leboulanger 19 Feb '13

19 Feb '13

changeset 2b95710f7c4f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b95710f7c4f description: handle the case when user press cancell at gnome keyring password dialog when saving a password. Fixes #7305 diffstat: src/common/passwords.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (22 lines): diff -r 001d4e759427 -r 2b95710f7c4f src/common/passwords.py --- a/src/common/passwords.py Sat Feb 16 23:49:39 2013 +0100 +++ b/src/common/passwords.py Tue Feb 19 13:22:49 2013 +0100 @@ -126,14 +126,14 @@ password = str() try: auth_token = gnomekeyring.item_create_sync( - self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, - display_name, attributes1, password, update) - except gnomekeyring.DeniedError: + self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, display_name, + attributes1, password, update) + except (gnomekeyring.DeniedError, gnomekeyring.CancelledError): set_storage(SimplePasswordStorage()) storage.save_password(account_name, password) return gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') + 'gnomekeyring:') if account_name in gajim.connections: gajim.connections[account_name].password = password

1 0

gajim: differenciate popup_image and popup_image_path un notific...
by Yann Leboulanger 18 Feb '13

18 Feb '13

changeset 0052f87c1e25 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0052f87c1e25 description: differenciate popup_image and popup_image_path un notification when we path an icon name or an image path diffstat: src/common/connection_handlers_events.py | 3 ++- src/notify.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diffs (45 lines): diff -r ebaa739d1c47 -r 0052f87c1e25 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 18 20:12:45 2013 +0100 +++ b/src/common/connection_handlers_events.py Mon Feb 18 20:52:04 2013 +0100 @@ -2350,7 +2350,7 @@ iconset = gajim.config.get('iconset') img_path = os.path.join(helpers.get_iconset_path(iconset), '48x48', show_image) - self.popup_image = self.get_path_to_generic_or_avatar(img_path, + self.popup_image_path = self.get_path_to_generic_or_avatar(img_path, jid=self.jid, suffix=suffix) self.popup_timeout = gajim.config.get('notification_timeout') @@ -2399,6 +2399,7 @@ self.popup_event_type = '' self.popup_msg_type = '' self.popup_image = '' + self.popup_image_path = '' self.popup_timeout = -1 self.do_command = False diff -r ebaa739d1c47 -r 0052f87c1e25 src/notify.py --- a/src/notify.py Mon Feb 18 20:12:45 2013 +0100 +++ b/src/notify.py Mon Feb 18 20:52:04 2013 +0100 @@ -156,13 +156,16 @@ def _nec_notification(self, obj): if obj.do_popup: - if isinstance(obj.popup_image, str): - icon_path = gtkgui_helpers.get_icon_path(obj.popup_image, - 48) + if obj.popup_image: + icon_path = gtkgui_helpers.get_icon_path(obj.popup_image, 48) if icon_path: - obj.popup_image = icon_path + image_path = icon_path + elif obj.popup_image_path: + image_path = obj.popup_image_path + else: + image_path = '' popup(obj.popup_event_type, obj.jid, obj.conn.name, - obj.popup_msg_type, path_to_image=obj.popup_image, + obj.popup_msg_type, path_to_image=image_path, title=obj.popup_title, text=obj.popup_text, timeout=obj.popup_timeout)

1 0

gajim: second part of previous commit ...
by Yann Leboulanger 18 Feb '13

18 Feb '13

changeset ebaa739d1c47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ebaa739d1c47 description: second part of previous commit ... diffstat: src/htmltextview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9e389765d1c8 -r ebaa739d1c47 src/htmltextview.py --- a/src/htmltextview.py Mon Feb 18 20:02:40 2013 +0100 +++ b/src/htmltextview.py Mon Feb 18 20:12:45 2013 +0100 @@ -954,7 +954,7 @@ if character == '\ufffc': anchor = search_iter.get_child_anchor() if anchor: - text = anchor.get_data('plaintext') + text = anchor.plaintext if text: selection+=text else:

1 0

gajim: fix a GObject Warning
by Yann Leboulanger 18 Feb '13

18 Feb '13

changeset 9e389765d1c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e389765d1c8 description: fix a GObject Warning diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 90fbae965900 -r 9e389765d1c8 src/conversation_textview.py --- a/src/conversation_textview.py Sun Feb 17 21:12:09 2013 +0100 +++ b/src/conversation_textview.py Mon Feb 18 20:02:40 2013 +0100 @@ -77,7 +77,7 @@ self.connect('parent-set', self.on_parent_set) self.connect('draw', self.on_expose) self.set_tooltip_text(text) - self.anchor.set_data('plaintext', text) + self.anchor.plaintext = text def _get_selected(self): parent = self.get_parent()

1 0

gajim: fix a traceback
by Yann Leboulanger 17 Feb '13

17 Feb '13

changeset 90fbae965900 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90fbae965900 description: fix a traceback diffstat: src/message_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r be35a310b6d2 -r 90fbae965900 src/message_window.py --- a/src/message_window.py Sun Feb 17 20:59:08 2013 +0100 +++ b/src/message_window.py Sun Feb 17 21:12:09 2013 +0100 @@ -738,7 +738,7 @@ def controls(self): for jid_dict in list(self._controls.values()): - for ctrl in jid_dict.values(): + for ctrl in list(jid_dict.values()): yield ctrl def get_nb_controls(self):

1 0

gajim: improve tree view filtering
by Yann Leboulanger 17 Feb '13

17 Feb '13

changeset f30cb7d4cb69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f30cb7d4cb69 description: improve tree view filtering diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 77e6e5283302 -r f30cb7d4cb69 src/roster_window.py --- a/src/roster_window.py Sat Feb 16 20:31:38 2013 +0100 +++ b/src/roster_window.py Sun Feb 17 20:58:28 2013 +0100 @@ -1563,6 +1563,8 @@ ############################################################################## def refilter_shown_roster_items(self): + if self.filtering: + return self.filtering = True self.modelfilter.refilter() self.filtering = False

1 0

gajim: fix set_geometry() usage
by Yann Leboulanger 17 Feb '13

17 Feb '13

changeset be35a310b6d2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be35a310b6d2 description: fix set_geometry() usage diffstat: src/notify.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r f30cb7d4cb69 -r be35a310b6d2 src/notify.py --- a/src/notify.py Sun Feb 17 20:58:28 2013 +0100 +++ b/src/notify.py Sun Feb 17 20:59:08 2013 +0100 @@ -362,7 +362,8 @@ if gajim.interface.systray_enabled and \ gajim.config.get('attach_notifications_to_systray'): status_icon = gajim.interface.systray.status_icon - x, y, width, height = status_icon.get_geometry()[1] + rect = status_icon.get_geometry()[2] + x, y, width, height = rect.x, rect.y, rect.width, rect.height pos_x = x + (width / 2) pos_y = y + (height / 2) hints = {'x': pos_x, 'y': pos_y}

1 0

gajim: fix typo
by Yann Leboulanger 17 Feb '13

17 Feb '13

changeset 35a555c4a107 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35a555c4a107 description: fix typo diffstat: src/common/xmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ee560e03f717 -r 35a555c4a107 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Tue Feb 12 19:31:35 2013 +0100 +++ b/src/common/xmpp/tls_nb.py Sun Feb 17 12:39:50 2013 +0100 @@ -449,7 +449,7 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1.ppend(cert.digest('sha1')) + self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1')) self._owner.ssl_certificate.append(cert) self._owner.ssl_errnum.append(errnum) self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate(

1 0

gajim: improve RTL behaviour. See #7284
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 001d4e759427 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=001d4e759427 description: improve RTL behaviour. See #7284 diffstat: src/conversation_textview.py | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diffs (63 lines): diff -r 639dad01a62b -r 001d4e759427 src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 16 12:27:28 2013 +0100 +++ b/src/conversation_textview.py Sat Feb 16 23:49:39 2013 +0100 @@ -1226,14 +1226,19 @@ # We don't have tim for outgoing messages... tim = time.localtime() current_print_time = gajim.config.get('print_time') + direction_mark = i18n.paragraph_direction_mark(unicode(text)) + # don't apply direction mark if it's status message + if kind == 'status': + direction_mark = '' if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) + timestamp = direction_mark + timestamp buffer_.insert_with_tags_by_name(end_iter, timestamp, - *other_tags_for_time) + *other_tags_for_time) elif current_print_time == 'sometimes' and kind != 'info' and not simple: every_foo_seconds = 60 * gajim.config.get( - 'print_ichat_every_foo_minutes') + 'print_ichat_every_foo_minutes') seconds_passed = time.mktime(tim) - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = time.mktime(tim) @@ -1259,12 +1264,14 @@ else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared: - self.print_name(name, kind, other_tags_for_name) + self.print_name(name, kind, other_tags_for_name, + direction_mark=direction_mark) else: self.print_real_text(gajim.config.get( - 'chat_merge_consecutive_nickname_indent')) + 'chat_merge_consecutive_nickname_indent')) else: - self.print_name(name, kind, other_tags_for_name) + self.print_name(name, kind, other_tags_for_name, + direction_mark=direction_mark) if kind == 'incoming': text_tags.append('incomingtxt') elif kind == 'outgoing': @@ -1333,7 +1340,7 @@ end_iter = buffer_.get_end_iter() buffer_.insert_with_tags(end_iter, ' ') - def print_name(self, name, kind, other_tags_for_name): + def print_name(self, name, kind, other_tags_for_name, direction_mark=''): if name: buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() @@ -1343,8 +1350,8 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format = before_str + name + after_str + ' ' - buffer_.insert_with_tags_by_name(end_iter, format, *name_tags) + format_ = direction_mark + before_str + name + after_str + ' ' + buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject): if subject: # if we have subject, show it too!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013