Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: Fix bad applied patch. Fixes #5570
by Yann Leboulanger 28 Mar '10

28 Mar '10

changeset abc0bb804d32 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=abc0bb804d32 description: Fix bad applied patch. Fixes #5570 diffstat: src/common/contacts.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r fd0e0975465c -r abc0bb804d32 src/common/contacts.py --- a/src/common/contacts.py Sun Mar 28 20:30:11 2010 +0200 +++ b/src/common/contacts.py Sun Mar 28 20:49:38 2010 +0200 @@ -594,8 +594,8 @@ return self._contacts[account].keys() def get_contacts_jid_list(self, account): - return [jid for jid, contact in self._contacts[account] if not - contact[0].is_groupchat()] + return [jid for jid, contact in self._contacts[account].iteritems() if \ + not contact[0].is_groupchat()] def contact_from_gc_contact(self, gc_contact): '''Create a Contact instance from a GC_Contact instance'''

1 0

gajim: fix typo. Fixes #5570
by Yann Leboulanger 28 Mar '10

28 Mar '10

changeset fd0e0975465c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd0e0975465c description: fix typo. Fixes #5570 diffstat: src/common/contacts.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9ce2a693021e -r fd0e0975465c src/common/contacts.py --- a/src/common/contacts.py Sun Mar 28 17:21:46 2010 +0200 +++ b/src/common/contacts.py Sun Mar 28 20:30:11 2010 +0200 @@ -594,7 +594,7 @@ return self._contacts[account].keys() def get_contacts_jid_list(self, account): - return [jid for jid, contact in self._contacts[accounts] if not + return [jid for jid, contact in self._contacts[account] if not contact[0].is_groupchat()] def contact_from_gc_contact(self, gc_contact):

1 0

gajim: [michich] fix get_contacts_jid_list call. Fixes #5570
by Yann Leboulanger 28 Mar '10

28 Mar '10

changeset 9ce2a693021e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9ce2a693021e description: [michich] fix get_contacts_jid_list call. Fixes #5570 diffstat: src/common/contacts.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r ef4552a4b55d -r 9ce2a693021e src/common/contacts.py --- a/src/common/contacts.py Sun Mar 28 11:39:08 2010 +0200 +++ b/src/common/contacts.py Sun Mar 28 17:21:46 2010 +0200 @@ -593,9 +593,9 @@ def get_jid_list(self, account): return self._contacts[account].keys() - def get_contacts_jid_list(self): - return [jid for jid, contact in self._contacts.iteritems() if not - contact[0].is_groupchat()] + def get_contacts_jid_list(self, account): + return [jid for jid, contact in self._contacts[accounts] if not + contact[0].is_groupchat()] def contact_from_gc_contact(self, gc_contact): '''Create a Contact instance from a GC_Contact instance'''

1 0

gajim: Fixed the autorejoin bug with overlimited MUC. Fixes #5678
by Alexander Cherniuk 28 Mar '10

28 Mar '10

changeset 41f07f329e6d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41f07f329e6d description: Fixed the autorejoin bug with overlimited MUC. Fixes #5678 diffstat: src/common/connection_handlers.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r f0c7b3f477e4 -r 41f07f329e6d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 28 11:34:17 2010 +0200 +++ b/src/common/connection_handlers.py Sun Mar 28 15:36:51 2010 +0300 @@ -1767,10 +1767,11 @@ self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, keyID, timestamp, None)) elif (errcode == '503'): - # maximum user number reached - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Maximum number of users for %s has been reached') % \ - room_jid)) + if gc_control is None or gc_control.autorejoin is None: + # maximum user number reached + self.dispatch('ERROR', (_('Unable to join group chat'), + _('Maximum number of users for %s has been reached') % \ + room_jid)) elif (errcode == '401') or (errcon == 'not-authorized'): # password required to join self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick))

1 0

gajim: fix call to get_contacts_jid_list. Fixes #5570
by Yann Leboulanger 28 Mar '10

28 Mar '10

changeset ef4552a4b55d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ef4552a4b55d description: fix call to get_contacts_jid_list. Fixes #5570 diffstat: src/common/contacts.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (18 lines): diff -r 1e64734c26ef -r ef4552a4b55d src/common/contacts.py --- a/src/common/contacts.py Thu Mar 18 13:31:12 2010 +0100 +++ b/src/common/contacts.py Sun Mar 28 11:39:08 2010 +0200 @@ -590,13 +590,10 @@ return False return True - def get_contacts_jid_list(self, account): - return self._accounts[account].contacts._get_contacts_jid_list() - def get_jid_list(self, account): return self._contacts[account].keys() - def _get_contacts_jid_list(self): + def get_contacts_jid_list(self): return [jid for jid, contact in self._contacts.iteritems() if not contact[0].is_groupchat()]

1 0

gajim: [Florob] improve geoloc usage. Fixes #5677
by Yann Leboulanger 28 Mar '10

28 Mar '10

changeset f0c7b3f477e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0c7b3f477e4 description: [Florob] improve geoloc usage. Fixes #5677 diffstat: src/common/location_listener.py | 42 ++++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diffs (63 lines): diff -r 8b4b2d8ff9dd -r f0c7b3f477e4 src/common/location_listener.py --- a/src/common/location_listener.py Sat Mar 27 16:18:30 2010 +0200 +++ b/src/common/location_listener.py Sun Mar 28 11:34:17 2010 +0200 @@ -37,28 +37,6 @@ self._data = {} def get_data(self): - self._get_address() - self._get_position() - - def _get_address(self): - bus = dbus.SessionBus() - if 'org.freedesktop.Geoclue.Master' not in bus.list_names(): - self._on_geoclue_address_changed() - return - obj = bus.get_object('org.freedesktop.Geoclue.Master', - '/org/freedesktop/Geoclue/Master') - # get MasterClient path - path = obj.Create() - # get MasterClient - cli = bus.get_object('org.freedesktop.Geoclue.Master', path) - cli.AddressStart() - # Check that there is a provider - name, description, service, path = cli.GetAddressProvider() - if path: - timestamp, address, accuracy = cli.GetAddress() - self._on_geoclue_address_changed(timestamp, address, accuracy) - - def _get_position(self): bus = dbus.SessionBus() if 'org.freedesktop.Geoclue.Master' not in bus.list_names(): self._on_geoclue_position_changed() @@ -69,11 +47,29 @@ path = obj.Create() # get MasterClient cli = bus.get_object('org.freedesktop.Geoclue.Master', path) + cli.SetRequirements(1, 0, True, 1023) + + self._get_address(cli) + self._get_position(cli) + + def _get_address(self, cli): + bus = dbus.SessionBus() + cli.AddressStart() + # Check that there is a provider + name, description, service, path = cli.GetAddressProvider() + if path: + provider = bus.get_object(service, path) + timestamp, address, accuracy = provider.GetAddress() + self._on_geoclue_address_changed(timestamp, address, accuracy) + + def _get_position(self, cli): + bus = dbus.SessionBus() cli.PositionStart() # Check that there is a provider name, description, service, path = cli.GetPositionProvider() if path: - fields, timestamp, lat, lon, alt, accuray = cli.GetPosition() + provider = bus.get_object(service, path) + fields, timestamp, lat, lon, alt, accuray = provider.GetPosition() self._on_geoclue_position_changed(fields, timestamp, lat, lon, alt, accuracy)

1 0

gajim: Small fix in Polish translation. Thanks to Jan Stępień....
by Alexander Cherniuk 27 Mar '10

27 Mar '10

changeset 8b4b2d8ff9dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b4b2d8ff9dd description: Small fix in Polish translation. Thanks to Jan Stępień. Fixes #5676 diffstat: po/pl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 95b7441ba299 -r 8b4b2d8ff9dd po/pl.po --- a/po/pl.po Fri Mar 26 21:23:05 2010 +0200 +++ b/po/pl.po Sat Mar 27 16:18:30 2010 +0200 @@ -3282,8 +3282,8 @@ #: ../src/common/config.py:88 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'." msgstr "" -"Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', " -"'podczas_zdarzenia', 'zawsze'." +"Kiedy pokazać ikonę w obszarze powiadomienia. Dostępne wartości to " +"'never' (nigdy), 'on_event' (podczas zdarzenia), 'always' (zawsze)." #: ../src/common/config.py:93 msgid "Incoming nickname color."

1 0

gajim: Use contracted form for RE flags
by Alexander Cherniuk 26 Mar '10

26 Mar '10

changeset 95b7441ba299 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95b7441ba299 description: Use contracted form for RE flags diffstat: src/gui_interface.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r e9c73ef32827 -r 95b7441ba299 src/gui_interface.py --- a/src/gui_interface.py Fri Mar 26 21:17:11 2010 +0200 +++ b/src/gui_interface.py Fri Mar 26 21:23:05 2010 +0200 @@ -2478,8 +2478,7 @@ basic_pattern = links + '|' + mail + '|' + legacy_prefixes link_pattern = basic_pattern - self.link_pattern_re = re.compile(link_pattern, re.IGNORECASE | - re.UNICODE) + self.link_pattern_re = re.compile(link_pattern, re.I | re.U) if gajim.config.get('use_latex'): basic_pattern += latex

1 0

gajim: Tweak URI detection RE to capture non-ascii symbols. Fixe...
by Alexander Cherniuk 26 Mar '10

26 Mar '10

changeset e9c73ef32827 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9c73ef32827 description: Tweak URI detection RE to capture non-ascii symbols. Fixes #5675 diffstat: src/gui_interface.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 5f046ba929ef -r e9c73ef32827 src/gui_interface.py --- a/src/gui_interface.py Fri Mar 26 14:52:54 2010 +0200 +++ b/src/gui_interface.py Fri Mar 26 21:17:11 2010 +0200 @@ -2461,8 +2461,7 @@ # FIXME: recognize xmpp: and treat it specially links = r"((?<=$)[A-Za-z][A-Za-z0-9\+\.\-]*:"\ r"([\w\.\-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ - r"(?=\)))|([A-Za-z][A-Za-z0-9\+\.\-]*:([\w\.\-_~:/\?#\[\]@!\$"\ - r"&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" + r"(?=\)))|(\w[\w\+\.\-]*:(\S|%[A-Fa-f0-9]{2})+)" # 2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]' @@ -2479,7 +2478,8 @@ basic_pattern = links + '|' + mail + '|' + legacy_prefixes link_pattern = basic_pattern - self.link_pattern_re = re.compile(link_pattern, re.IGNORECASE) + self.link_pattern_re = re.compile(link_pattern, re.IGNORECASE | + re.UNICODE) if gajim.config.get('use_latex'): basic_pattern += latex

1 0

gajim: List comprehension fits better
by Alexander Cherniuk 26 Mar '10

26 Mar '10

changeset 5f046ba929ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f046ba929ef description: List comprehension fits better diffstat: src/command_system/implementation/standard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 84a75dabe7f4 -r 5f046ba929ef src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 25 19:52:27 2010 +0100 +++ b/src/command_system/implementation/standard.py Fri Mar 26 14:52:54 2010 +0200 @@ -182,8 +182,8 @@ def dtmf(self, events): if not self.audio_sid: raise CommandError(_("There is no open audio session with this contact")) - # Valid values for DTMF tones are *, # or a number - events = filter(lambda e: e in ('*', '#') or e.isdigit (), events) + # Valid values for DTMF tones are *, # or a number. + events = [e for e in events if e in ('*', '#') or e.isdigit()] if events: session = gajim.connections[self.account].get_jingle_session( self.contact.get_full_jid(), self.audio_sid)

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010