Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: Does not look like we need to emulate gobject.timeout_add...
by Alexander Cherniuk 31 Mar '10

31 Mar '10

changeset 55ecfb639419 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55ecfb639419 description: Does not look like we need to emulate gobject.timeout_add_second anymore diffstat: src/gajim.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diffs (16 lines): diff -r 4596af2b4747 -r 55ecfb639419 src/gajim.py --- a/src/gajim.py Wed Mar 31 09:19:21 2010 +0300 +++ b/src/gajim.py Wed Mar 31 17:05:58 2010 +0300 @@ -215,12 +215,6 @@ import gtkexcepthook -import gobject -if not hasattr(gobject, 'timeout_add_seconds'): - def timeout_add_seconds_fake(time_sec, *args): - return gobject.timeout_add(time_sec * 1000, *args) - gobject.timeout_add_seconds = timeout_add_seconds_fake - import signal import gtkgui_helpers

1 0

gajim: Moved a call to gobject.set_prgname a bit up
by Alexander Cherniuk 31 Mar '10

31 Mar '10

changeset 4596af2b4747 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4596af2b4747 description: Moved a call to gobject.set_prgname a bit up diffstat: src/gajim.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (29 lines): diff -r 08a9b566c537 -r 4596af2b4747 src/gajim.py --- a/src/gajim.py Wed Mar 31 09:05:17 2010 +0300 +++ b/src/gajim.py Wed Mar 31 09:19:21 2010 +0300 @@ -135,6 +135,7 @@ # PyGTK2.10+ only throws a warning warnings.filterwarnings('error', module='gtk') try: + import gobject import gtk except Warning, msg2: if str(msg2) == 'could not open display': @@ -144,6 +145,8 @@ sys.exit() warnings.resetwarnings() +gobject.set_prgname('gajim') + if os.name == 'nt': warnings.filterwarnings(action='ignore') @@ -218,8 +221,6 @@ return gobject.timeout_add(time_sec * 1000, *args) gobject.timeout_add_seconds = timeout_add_seconds_fake -gobject.set_prgname('gajim') - import signal import gtkgui_helpers

1 0

gajim: Added a call to gobject.set_prgname
by Alexander Cherniuk 31 Mar '10

31 Mar '10

changeset 08a9b566c537 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08a9b566c537 description: Added a call to gobject.set_prgname diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c924fe083d58 -r 08a9b566c537 src/gajim.py --- a/src/gajim.py Tue Mar 30 21:28:50 2010 +0300 +++ b/src/gajim.py Wed Mar 31 09:05:17 2010 +0300 @@ -218,6 +218,7 @@ return gobject.timeout_add(time_sec * 1000, *args) gobject.timeout_add_seconds = timeout_add_seconds_fake +gobject.set_prgname('gajim') import signal import gtkgui_helpers

1 0

gajim: Fixed a typo
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset c924fe083d58 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c924fe083d58 description: Fixed a typo diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8433f9f3331e -r c924fe083d58 src/tooltips.py --- a/src/tooltips.py Tue Mar 30 18:14:03 2010 +0300 +++ b/src/tooltips.py Tue Mar 30 21:28:50 2010 +0300 @@ -658,7 +658,7 @@ if 'tune' in contact.pep: tune = contact.pep['tune'].asMarkupText() - properties.append((_("Tune: %s")) % tune, None)) + properties.append((_("Tune: %s") % tune, None)) if 'location' in contact.pep: location = contact.pep['location'].asMarkupText()

1 0

gajim: No need to separate %s from translatable strings
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset 8433f9f3331e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8433f9f3331e description: No need to separate %s from translatable strings diffstat: src/tooltips.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diffs (31 lines): diff -r 780250dc40f4 -r 8433f9f3331e src/tooltips.py --- a/src/tooltips.py Tue Mar 30 17:09:14 2010 +0300 +++ b/src/tooltips.py Tue Mar 30 18:14:03 2010 +0300 @@ -650,23 +650,19 @@ """ if 'mood' in contact.pep: mood = contact.pep['mood'].asMarkupText() - mood_string = _('Mood:') + ' %s' % mood - properties.append((mood_string, None)) + properties.append((_("Mood: %s") % mood, None)) if 'activity' in contact.pep: activity = contact.pep['activity'].asMarkupText() - activity_string = _('Activity:') + ' %s' % activity - properties.append((activity_string, None)) + properties.append((_("Activity: %s") % activity, None)) if 'tune' in contact.pep: tune = contact.pep['tune'].asMarkupText() - tune_string = _('Tune:') + ' %s' % tune - properties.append((tune_string, None)) + properties.append((_("Tune: %s")) % tune, None)) if 'location' in contact.pep: location = contact.pep['location'].asMarkupText() - location_string = _('Location:') + ' %s' % location - properties.append((location_string, None)) + properties.append((_("Location: %s") % location, None)) class FileTransfersTooltip(BaseTooltip):

1 0

gajim: Forgot the translation
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset 780250dc40f4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=780250dc40f4 description: Forgot the translation diffstat: src/tooltips.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r e92de25e57e9 -r 780250dc40f4 src/tooltips.py --- a/src/tooltips.py Tue Mar 30 17:03:10 2010 +0300 +++ b/src/tooltips.py Tue Mar 30 17:09:14 2010 +0300 @@ -598,8 +598,8 @@ formatted = last_active.strftime("%c") properties.append((str(), None)) - properties.append(("Idle since %s" % formatted, None)) - properties.append(("Idle for %s" % str(diff), None)) + properties.append((_("Idle since %s") % formatted, None)) + properties.append((_("Idle for %s") % str(diff), None)) while properties: property_ = properties.pop(0)

1 0

gajim: Yet another improvement for the tooltip
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset e92de25e57e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e92de25e57e9 description: Yet another improvement for the tooltip diffstat: src/tooltips.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diffs (25 lines): diff -r aff1a4ec501d -r e92de25e57e9 src/tooltips.py --- a/src/tooltips.py Tue Mar 30 16:39:49 2010 +0300 +++ b/src/tooltips.py Tue Mar 30 17:03:10 2010 +0300 @@ -586,9 +586,6 @@ gobject.markup_escape_text(keyID))) if contact.last_activity_time: - text_since = _("Idle since %s") - text_for = _("Idle for %s") - last_active = datetime(*contact.last_activity_time[:6]) current = datetime.now() @@ -600,8 +597,9 @@ else: formatted = last_active.strftime("%c") - properties.append((text_since % formatted, None)) - properties.append((text_for % str(diff), None)) + properties.append((str(), None)) + properties.append(("Idle since %s" % formatted, None)) + properties.append(("Idle for %s" % str(diff), None)) while properties: property_ = properties.pop(0)

1 0

gajim: Improved idle time displaying in the tooltip
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset aff1a4ec501d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aff1a4ec501d description: Improved idle time displaying in the tooltip diffstat: src/tooltips.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (36 lines): diff -r f80e603da50f -r aff1a4ec501d src/tooltips.py --- a/src/tooltips.py Tue Mar 30 15:27:59 2010 +0300 +++ b/src/tooltips.py Tue Mar 30 16:39:49 2010 +0300 @@ -34,6 +34,7 @@ import time import locale from datetime import datetime +from datetime import timedelta import gtkgui_helpers @@ -585,17 +586,22 @@ gobject.markup_escape_text(keyID))) if contact.last_activity_time: - text = _("Idle since: %s") + text_since = _("Idle since %s") + text_for = _("Idle for %s") last_active = datetime(*contact.last_activity_time[:6]) current = datetime.now() + diff = current - last_active + diff = timedelta(diff.days, diff.seconds) + if last_active.date() == current.date(): formatted = last_active.strftime("%X") else: formatted = last_active.strftime("%c") - properties.append((text % formatted, None)) + properties.append((text_since % formatted, None)) + properties.append((text_for % str(diff), None)) while properties: property_ = properties.pop(0)

1 0

gajim: Cleaned the code for the 'Idle since' tooltip item
by Alexander Cherniuk 30 Mar '10

30 Mar '10

changeset f80e603da50f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f80e603da50f description: Cleaned the code for the 'Idle since' tooltip item diffstat: src/tooltips.py | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diffs (42 lines): diff -r f3a0c5a4b023 -r f80e603da50f src/tooltips.py --- a/src/tooltips.py Tue Mar 30 11:59:28 2010 +0000 +++ b/src/tooltips.py Tue Mar 30 15:27:59 2010 +0300 @@ -33,6 +33,7 @@ import os import time import locale +from datetime import datetime import gtkgui_helpers @@ -584,21 +585,17 @@ gobject.markup_escape_text(keyID))) if contact.last_activity_time: - text = _(' since %s') + text = _("Idle since: %s") - if time.strftime('%j', time.localtime())== \ - time.strftime('%j', contact.last_activity_time): - # it's today, show only the locale hour representation - local_time = time.strftime('%I:%M %p', - contact.last_activity_time) + last_active = datetime(*contact.last_activity_time[:6]) + current = datetime.now() + + if last_active.date() == current.date(): + formatted = last_active.strftime("%X") else: - # time.strftime returns locale encoded string - local_time = time.strftime('%c', - contact.last_activity_time) - local_time = local_time.decode( - locale.getpreferredencoding()) - text = text % local_time - properties.append(('Idle' + text, None)) + formatted = last_active.strftime("%c") + + properties.append((text % formatted, None)) while properties: property_ = properties.pop(0)

1 0

gajim: Fixed out-of-scope variables. Might need a better fix. Fi...
by Alexander Cherniuk 29 Mar '10

29 Mar '10

changeset 038aadf51394 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=038aadf51394 description: Fixed out-of-scope variables. Might need a better fix. Fixes #5680 diffstat: src/disco.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 41f07f329e6d -r 038aadf51394 src/disco.py --- a/src/disco.py Sun Mar 28 15:36:51 2010 +0300 +++ b/src/disco.py Mon Mar 29 17:15:32 2010 +0300 @@ -1671,6 +1671,7 @@ # Search for an icon and category we can display pix = self.cache.get_icon(identities) + cat, type_ = None, None for identity in identities: try: cat, type_ = identity['category'], identity['type']

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010