Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: [Florian Zeitz] More compatibility for MPRIS.
by Jonathan Schleifer 21 Jul '09

21 Jul '09

changeset 19808e1ac164 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19808e1ac164 description: [Florian Zeitz] More compatibility for MPRIS. diffstat: src/music_track_listener.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diffs (24 lines): diff -r 7f7118c375a1 -r 19808e1ac164 src/music_track_listener.py --- a/src/music_track_listener.py Tue Jul 21 00:30:43 2009 +0200 +++ b/src/music_track_listener.py Wed Jul 22 00:13:28 2009 +0200 @@ -130,10 +130,16 @@ return info def _mpris_playing_changed_cb(self, playing): - if playing: - self.emit('music-track-changed', None) - else: - self.emit('music-track-changed', self._last_playing_music) + if type(playing) is dbus.Struct: + if playing[0]: + self.emit('music-track-changed', None) + else: + self.emit('music-track-changed', self._last_playing_music) + else: # Workaround for e.g. Audacious + if playing: + self.emit('music-track-changed', None) + else: + self.emit('music-track-changed', self._last_playing_music) def _mpris_music_track_change_cb(self, arg): self._last_playing_music = self._mpris_properties_extract(arg)

1 0

gajim: copy list before iterating on it in case we modify it.
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset f29ce53f497d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f29ce53f497d description: copy list before iterating on it in case we modify it. diffstat: src/common/contacts.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d3923cf70905 -r f29ce53f497d src/common/contacts.py --- a/src/common/contacts.py Mon Jul 20 23:51:17 2009 +0200 +++ b/src/common/contacts.py Tue Jul 21 00:13:55 2009 +0200 @@ -292,7 +292,7 @@ def iter_contacts(self, account): if account in self._contacts: for jid in self._contacts[account].keys(): - for contact in self._contacts[account][jid]: + for contact in self._contacts[account][jid][:]: yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: stupid me, calling .keys() on a dict ...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset d3923cf70905 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d3923cf70905 description: stupid me, calling .keys() on a dict ... diffstat: src/common/contacts.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f11542b2fe60 -r d3923cf70905 src/common/contacts.py --- a/src/common/contacts.py Mon Jul 20 23:47:59 2009 +0200 +++ b/src/common/contacts.py Mon Jul 20 23:51:17 2009 +0200 @@ -292,7 +292,7 @@ def iter_contacts(self, account): if account in self._contacts: for jid in self._contacts[account].keys(): - for contact in self._contacts[account][jid].keys(): + for contact in self._contacts[account][jid]: yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: prevent traceback when we remove contacts in iter_contact...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset f11542b2fe60 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f11542b2fe60 description: prevent traceback when we remove contacts in iter_contacts() loop. diffstat: src/common/contacts.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r ce64723d2f88 -r f11542b2fe60 src/common/contacts.py --- a/src/common/contacts.py Sun Jul 19 23:45:03 2009 +0200 +++ b/src/common/contacts.py Mon Jul 20 23:47:59 2009 +0200 @@ -291,8 +291,8 @@ def iter_contacts(self, account): if account in self._contacts: - for jid in self._contacts[account]: - for contact in self._contacts[account][jid]: + for jid in self._contacts[account].keys(): + for contact in self._contacts[account][jid].keys(): yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: remove old out of date file
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset ce64723d2f88 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce64723d2f88 description: remove old out of date file diffstat: TODO.pep | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diffs (12 lines): diff -r 50cc67d8a2c7 -r ce64723d2f88 TODO.pep --- a/TODO.pep Sun Jul 19 22:09:09 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -• configure access model when changing it in the combobox -• PEP in status change - -Tune use cases: -• on disconnection of an account set Tune to None - -Tooltips use cases: -• Show PEP in GC tooltips

1 0

gajim: Fix traceback in MPRIS.
by Jonathan Schleifer 21 Jul '09

21 Jul '09

changeset 50cc67d8a2c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50cc67d8a2c7 description: Fix traceback in MPRIS. diffstat: src/music_track_listener.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (17 lines): diff -r bc4499a70100 -r 50cc67d8a2c7 src/music_track_listener.py --- a/src/music_track_listener.py Thu Jul 16 17:54:43 2009 +0200 +++ b/src/music_track_listener.py Sun Jul 19 22:09:09 2009 +0200 @@ -130,10 +130,10 @@ return info def _mpris_playing_changed_cb(self, playing): - if playing[0] == 0: + if playing: + self.emit('music-track-changed', None) + else: self.emit('music-track-changed', self._last_playing_music) - else: - self.emit('music-track-changed', None) def _mpris_music_track_change_cb(self, arg): self._last_playing_music = self._mpris_properties_extract(arg)

1 0

gajim: redraw correctly accountsWindow after we removed an account
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset bc4499a70100 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc4499a70100 description: redraw correctly accountsWindow after we removed an account diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 31154d0920b8 -r bc4499a70100 src/config.py --- a/src/config.py Thu Jul 16 17:44:45 2009 +0200 +++ b/src/config.py Thu Jul 16 17:54:43 2009 +0200 @@ -2693,6 +2693,7 @@ gajim.interface.roster.set_actions_menu_needs_rebuild() if 'accounts' in gajim.interface.instances: gajim.interface.instances['accounts'].init_accounts() + gajim.interface.instances['accounts'].init_account() self.window.destroy() #---------- ManageBookmarksWindow class -------------#

1 0

gajim: import things differently in xmpp so it works with python...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 31154d0920b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31154d0920b8 description: import things differently in xmpp so it works with python26. Fixes #5168 diffstat: src/common/xmpp/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 2117e286bb97 -r 31154d0920b8 src/common/xmpp/__init__.py --- a/src/common/xmpp/__init__.py Thu Jul 16 17:23:05 2009 +0200 +++ b/src/common/xmpp/__init__.py Thu Jul 16 17:44:45 2009 +0200 @@ -26,9 +26,9 @@ """ +from protocol import * import simplexml,protocol,debug,auth_nb,auth,transports,transports_nb,roster_nb,roster,dispatcher_nb,features_nb,features,browser,filetransfer,commands, idlequeue from client_nb import * from client import * -from protocol import * -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

gajim: fix sending message to zeroconf from XML console. Fixes #...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 2117e286bb97 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2117e286bb97 description: fix sending message to zeroconf from XML console. Fixes #5050 diffstat: src/common/zeroconf/connection_zeroconf.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 3e42c82db23d -r 2117e286bb97 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Thu Jul 16 15:29:07 2009 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Thu Jul 16 17:23:05 2009 +0200 @@ -490,6 +490,8 @@ # send a stanza untouched if not self.connection: return + if not isinstance(stanza, common.xmpp.Node): + stanza = common.xmpp.Protocol(node=stanza) self.connection.send(stanza) def ack_subscribed(self, jid):

1 0

gajim: detect and send all our local IPs from local DNS. Fixes #...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 3e42c82db23d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e42c82db23d description: detect and send all our local IPs from local DNS. Fixes #4249 diffstat: src/common/connection_handlers.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diffs (28 lines): diff -r a1acdd00e6b6 -r 3e42c82db23d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 16 14:53:14 2009 +0200 +++ b/src/common/connection_handlers.py Thu Jul 16 15:29:07 2009 +0200 @@ -224,12 +224,18 @@ ostreamhost.setAttr('host', ft_host) ostreamhost.setAttr('jid', sender) try: - thehost = self.peerhost[0] - streamhost = common.xmpp.Node(tag = 'streamhost') # My IP - query.addChild(node = streamhost) - streamhost.setAttr('port', unicode(port)) - streamhost.setAttr('host', thehost) - streamhost.setAttr('jid', sender) + # The ip we're connected to server with + my_ips = [self.peerhost[0]] + # all IPs from local DNS + for addr in socket.getaddrinfo(socket.gethostname(), None): + if not addr[4][0] in my_ips: + my_ips.append(addr[4][0]) + for ip in my_ips: + streamhost = common.xmpp.Node(tag = 'streamhost') + query.addChild(node = streamhost) + streamhost.setAttr('port', unicode(port)) + streamhost.setAttr('host', ip) + streamhost.setAttr('jid', sender) except socket.gaierror: self.dispatch('ERROR', (_('Wrong host'), _('Invalid local address? :-O')))

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

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 July 2009