Commits

commits@gajim.org

17632 discussions

gajim: fix change theme in gc
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 263cf1c24c6a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=263cf1c24c6a description: fix change theme in gc diffstat: src/groupchat_control.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (29 lines): diff -r ab98d60d26c2 -r 263cf1c24c6a src/groupchat_control.py --- a/src/groupchat_control.py Thu Jan 03 17:13:19 2013 +0400 +++ b/src/groupchat_control.py Thu Jan 03 17:26:12 2013 +0400 @@ -31,6 +31,7 @@ import time import locale 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 @@ -710,7 +711,7 @@ model[iter_][C_NICK] = model[iter_][C_NICK] def change_roster_style(self): - self.model.foreach(self._change_style) + self.model.foreach(self._change_style, None) def repaint_themed_widgets(self): ChatControlBase.repaint_themed_widgets(self) @@ -1971,7 +1972,7 @@ gajim.config.set('gc-hpaned-position', self.hpaned.get_position()) # remove all register handlers on wigets, created by self.xml # to prevent circular references among objects - for i in self.handlers.keys(): + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) del self.handlers[i]

1 0

gajim: Close all the windows on exit
by Denis Fomin 03 Jan '13

03 Jan '13

changeset ab98d60d26c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab98d60d26c2 description: Close all the windows on exit diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 959f612143dd -r ab98d60d26c2 src/roster_window.py --- a/src/roster_window.py Thu Jan 03 17:09:51 2013 +0400 +++ b/src/roster_window.py Thu Jan 03 17:13:19 2013 +0400 @@ -2394,7 +2394,7 @@ """ Close all the windows in the given dictionary """ - for w in dic.values(): + for w in list(dic.values()): if isinstance(w, dict): self.close_all_from_dict(w) else:

1 0

gajim: close file automaticaly
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 959f612143dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=959f612143dd description: close file automaticaly diffstat: src/profile_window.py | 4 ++-- src/remote_control.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (28 lines): diff -r dd57b96138ad -r 959f612143dd src/profile_window.py --- a/src/profile_window.py Thu Jan 03 17:03:40 2013 +0400 +++ b/src/profile_window.py Thu Jan 03 17:09:51 2013 +0400 @@ -154,8 +154,8 @@ scaled_pixbuf.savev(path_to_file, 'png', [], []) must_delete = True - fd = open(path_to_file, 'rb') - data = fd.read() + with open(path_to_file, 'rb') as fd: + data = fd.read() pixbuf = gtkgui_helpers.get_pixbuf_from_data(data) try: # rescale it diff -r dd57b96138ad -r 959f612143dd src/remote_control.py --- a/src/remote_control.py Thu Jan 03 17:03:40 2013 +0400 +++ b/src/remote_control.py Thu Jan 03 17:09:51 2013 +0400 @@ -905,8 +905,8 @@ else: invalid_file = True if not invalid_file and filesize < 16384: - fd = open(picture, 'rb') - data = fd.read() + with open(picture, 'rb') as fb: + data = fd.read() avatar = base64.b64encode(data).decode('utf-8') avatar_mime_type = mimetypes.guess_type(picture)[0] vcard={}

1 0

gajim: fix set avatar in remote control
by Denis Fomin 03 Jan '13

03 Jan '13

changeset dd57b96138ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd57b96138ad description: fix set avatar in remote control diffstat: src/remote_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fa3f711c4847 -r dd57b96138ad src/remote_control.py --- a/src/remote_control.py Thu Jan 03 17:02:14 2013 +0400 +++ b/src/remote_control.py Thu Jan 03 17:03:40 2013 +0400 @@ -907,7 +907,7 @@ if not invalid_file and filesize < 16384: fd = open(picture, 'rb') data = fd.read() - avatar = base64.b64encode(data.encode('utf-8')).decode('utf-8') + avatar = base64.b64encode(data).decode('utf-8') avatar_mime_type = mimetypes.guess_type(picture)[0] vcard={} vcard['PHOTO'] = {'BINVAL': avatar}

1 0

gajim: fix set avatar
by Denis Fomin 03 Jan '13

03 Jan '13

changeset fa3f711c4847 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa3f711c4847 description: fix set avatar diffstat: src/common/connection_handlers.py | 5 ++--- src/profile_window.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diffs (35 lines): diff -r b829075ef5d4 -r fa3f711c4847 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jan 03 14:58:01 2013 +0400 +++ b/src/common/connection_handlers.py Thu Jan 03 17:02:14 2013 +0400 @@ -431,8 +431,7 @@ if 'PHOTO' in vcard and isinstance(vcard['PHOTO'], dict) and \ 'BINVAL' in vcard['PHOTO']: photo = vcard['PHOTO']['BINVAL'] - photo_decoded = base64.b64decode(photo.encode('utf-8')).decode( - 'utf-8') + photo_decoded = base64.b64decode(photo.encode('utf-8')) gajim.interface.save_avatar_files(our_jid, photo_decoded) avatar_sha = hashlib.sha1(photo_decoded).hexdigest() iq2.getTag('PHOTO').setTagData('SHA', avatar_sha) @@ -685,7 +684,7 @@ 'BINVAL' in vcard['PHOTO']: photo = vcard['PHOTO']['BINVAL'] try: - photo_decoded = base64.b64decode(photo.encode('utf-8')).decode('utf-8') + photo_decoded = base64.b64decode(photo.encode('utf-8')) avatar_sha = hashlib.sha1(photo_decoded).hexdigest() except Exception: avatar_sha = '' diff -r b829075ef5d4 -r fa3f711c4847 src/profile_window.py --- a/src/profile_window.py Thu Jan 03 14:58:01 2013 +0400 +++ b/src/profile_window.py Thu Jan 03 17:02:14 2013 +0400 @@ -171,8 +171,7 @@ button.show() text_button = self.xml.get_object('NOPHOTO_button') text_button.hide() - self.avatar_encoded = base64.b64encode(data.encode('utf-8')).decode( - 'utf-8') + self.avatar_encoded = base64.b64encode(data).decode('utf-8') # returns None if unknown type self.avatar_mime_type = mimetypes.guess_type(path_to_file)[0] if must_delete:

1 0

gajim: fix avatars in roster
by Denis Fomin 03 Jan '13

03 Jan '13

changeset b829075ef5d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b829075ef5d4 description: fix avatars in roster diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c6ccdb652d23 -r b829075ef5d4 src/vcard.py --- a/src/vcard.py Thu Jan 03 13:41:52 2013 +0400 +++ b/src/vcard.py Thu Jan 03 14:58:01 2013 +0400 @@ -61,7 +61,7 @@ img_encoded = photo['BINVAL'] avatar_encoded = img_encoded try: - img_decoded = base64.b64decode(img_encoded.encode('utf-8')).decode('utf-8') + img_decoded = base64.b64decode(img_encoded.encode('utf-8')) except Exception: pass if img_decoded:

1 0

gajim: fix gettext
by Denis Fomin 03 Jan '13

03 Jan '13

changeset c6ccdb652d23 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c6ccdb652d23 description: fix gettext diffstat: src/common/i18n.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f846f2987563 -r c6ccdb652d23 src/common/i18n.py --- a/src/common/i18n.py Thu Jan 03 11:47:34 2013 +0400 +++ b/src/common/i18n.py Thu Jan 03 13:41:52 2013 +0400 @@ -94,7 +94,7 @@ In other words this is a hack to ngettext() to support %s %d etc.. """ - text = _translation.ungettext(s_sing, s_plural, n) + text = _translation.ngettext(s_sing, s_plural, n) if n == 1 and replace_sing is not None: text = text % replace_sing elif n > 1 and replace_plural is not None:

1 0

gajim: fix error handling
by Denis Fomin 03 Jan '13

03 Jan '13

changeset f846f2987563 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f846f2987563 description: fix error handling diffstat: src/common/proxy65_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c71a577191b7 -r f846f2987563 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Thu Jan 03 04:16:14 2013 +0400 +++ b/src/common/proxy65_manager.py Thu Jan 03 11:47:34 2013 +0400 @@ -462,7 +462,7 @@ self._send = self._sock.send self._recv = self._sock.recv except Exception as ee: - errnum = ee[0] + errnum = ee.errno # 56 is for freebsd if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # still trying to connect

1 0

gajim: fix client local time
by Denis Fomin 03 Jan '13

03 Jan '13

changeset c71a577191b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c71a577191b7 description: fix client local time diffstat: src/tooltips.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r a41681d3289d -r c71a577191b7 src/tooltips.py --- a/src/tooltips.py Thu Jan 03 04:08:07 2013 +0400 +++ b/src/tooltips.py Thu Jan 03 04:16:14 2013 +0400 @@ -567,8 +567,7 @@ # time.strftime returns locale encoded string local_time = time.strftime('%c', contact.last_status_time) - local_time = local_time.decode( - locale.getpreferredencoding()) + text = text % local_time show += text if self.account and \

1 0

gajim: fix generator and range
by Denis Fomin 03 Jan '13

03 Jan '13

changeset a41681d3289d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a41681d3289d description: fix generator and range diffstat: src/common/helpers.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 482ca6487aae -r a41681d3289d src/common/helpers.py --- a/src/common/helpers.py Thu Jan 03 03:25:44 2013 +0400 +++ b/src/common/helpers.py Thu Jan 03 04:08:07 2013 +0400 @@ -951,7 +951,7 @@ """ Create random string of length 16 """ - rng = range(65, 90) + rng = list(range(65, 90)) rng.extend(range(48, 57)) char_sequence = [chr(e) for e in rng] from random import sample diff -r 482ca6487aae -r a41681d3289d src/roster_window.py --- a/src/roster_window.py Thu Jan 03 03:25:44 2013 +0400 +++ b/src/roster_window.py Thu Jan 03 04:08:07 2013 +0400 @@ -1415,7 +1415,7 @@ yield False task = _draw_all_contacts(jids, account) - GObject.idle_add(task.next) + GObject.idle_add(next, task) def _before_fill(self): self.tree.freeze_child_notify()

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