Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: don't remove occupant from room roster when we try to cha...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset a1acdd00e6b6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1acdd00e6b6 description: don't remove occupant from room roster when we try to change our nick to the occupant's nick. Fixes #5120 diffstat: src/common/connection_handlers.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r c7c431ea5ad5 -r a1acdd00e6b6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 14 16:41:25 2009 +0200 +++ b/src/common/connection_handlers.py Thu Jul 16 14:53:14 2009 +0200 @@ -2233,8 +2233,9 @@ # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) - self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, - keyID, timestamp, None)) + if errcode != '409': # conflict # See #5120 + self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, + prio, keyID, timestamp, None)) if ptype == 'unavailable' and jid_stripped in self.sessions: # automatically terminate sessions that they haven't sent a thread ID

1 0

gajim: don't send a new presence when we only want to change pep...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset c7c431ea5ad5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7c431ea5ad5 description: don't send a new presence when we only want to change pep info diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 96b61b4ccfaa -r c7c431ea5ad5 src/roster_window.py --- a/src/roster_window.py Sat Jul 11 09:58:06 2009 +0200 +++ b/src/roster_window.py Tue Jul 14 16:41:25 2009 +0200 @@ -1916,6 +1916,9 @@ child_iterA = self._get_account_iter(account, self.model) if status != 'offline': if to is None: + if status == gajim.connections[account].get_status() and \ + txt == gajim.connections[account].status: + return gajim.config.set_per('accounts', account, 'last_status', status) gajim.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt))

1 0

gajim: include gajim.svg in tarball
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 96b61b4ccfaa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=96b61b4ccfaa description: include gajim.svg in tarball diffstat: data/pixmaps/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 8dbd0a425c75 -r 96b61b4ccfaa data/pixmaps/Makefile.am --- a/data/pixmaps/Makefile.am Thu Jul 09 19:06:08 2009 +0200 +++ b/data/pixmaps/Makefile.am Sat Jul 11 09:58:06 2009 +0200 @@ -1,5 +1,6 @@ pixmapsdir = $(pkgdatadir)/data/pixmaps pixmaps_DATA = $(srcdir)/*.png \ + gajim.svg \ gajim.ico pixmapseventsdir = $(pkgdatadir)/data/pixmaps/events

1 0

gajim: Fix traceback when right click on email in history viewer...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 8dbd0a425c75 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8dbd0a425c75 description: Fix traceback when right click on email in history viewer. Fixes #5131 diffstat: src/conversation_textview.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (22 lines): diff -r 6eb2fa8c41e5 -r 8dbd0a425c75 src/conversation_textview.py --- a/src/conversation_textview.py Thu Jul 09 18:22:41 2009 +0200 +++ b/src/conversation_textview.py Thu Jul 09 19:06:08 2009 +0200 @@ -842,12 +842,13 @@ self.handlers[id] = childs[6] allow_add = False - c = gajim.contacts.get_first_contact_from_jid(self.account, text) - if c and not gajim.contacts.is_pm_from_contact(self.account, c): - if _('Not in Roster') in c.groups: + if self.account: + c = gajim.contacts.get_first_contact_from_jid(self.account, text) + if c and not gajim.contacts.is_pm_from_contact(self.account, c): + if _('Not in Roster') in c.groups: + allow_add = True + else: # he or she's not at all in the account contacts allow_add = True - else: # he or she's not at all in the account contacts - allow_add = True if allow_add: id = childs[7].connect('activate', self.on_add_to_roster_activate,

1 0

gajim: handle correctly when MUC server force us to change our n...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 6eb2fa8c41e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6eb2fa8c41e5 description: handle correctly when MUC server force us to change our nickname by sending a 303 error presence. Fixes #5055 diffstat: src/groupchat_control.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 7558007fd566 -r 6eb2fa8c41e5 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jul 08 21:41:40 2009 +0200 +++ b/src/groupchat_control.py Thu Jul 09 18:22:41 2009 +0200 @@ -1159,8 +1159,9 @@ 'reason': reason } self.print_conversation(s, 'info', tim = tim) elif '303' in statusCode: # Someone changed his or her nick - if new_nick == self.new_nick: # We changed our nick - self.nick = self.new_nick + if new_nick == self.new_nick or nick == self.nick: + # We changed our nick + self.nick = new_nick self.new_nick = '' s = _('You are now known as %s') % new_nick else:

1 0

gajim: handle jid errors
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 7558007fd566 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7558007fd566 description: handle jid errors diffstat: src/common/connection_handlers.py | 56 ++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 11 deletions(-) diffs (134 lines): diff -r a0e7fc97eea9 -r 7558007fd566 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 07 16:56:04 2009 +0200 +++ b/src/common/connection_handlers.py Wed Jul 08 21:41:40 2009 +0200 @@ -728,7 +728,7 @@ if 'jid' not in attr: continue try: - helpers.parse_jid(attr['jid']) + attr['jid'] = helpers.parse_jid(attr['jid']) except common.helpers.InvalidFormat: # jid is not conform continue @@ -1122,7 +1122,10 @@ storage = query.getTag('storage') metas = storage.getTags('meta') for meta in metas: - jid = helpers.parse_jid(meta.getAttr('jid')) + try: + jid = helpers.parse_jid(meta.getAttr('jid')) + except common.helpers.InvalidFormat: + continue tag = meta.getAttr('tag') data = {'jid': jid} order = meta.getAttr('order') @@ -1482,14 +1485,18 @@ print_status = conf.getTagData('print_status') if not print_status: print_status = conf.getTagData('show_status') - bm = {'name': conf.getAttr('name'), + try: + bm = {'name': conf.getAttr('name'), 'jid': helpers.parse_jid(conf.getAttr('jid')), 'autojoin': autojoin_val, 'minimize': minimize_val, 'password': conf.getTagData('password'), 'nick': conf.getTagData('nick'), 'print_status': print_status} - + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + continue + self.bookmarks.append(bm) self.dispatch('BOOKMARKS', self.bookmarks) @@ -1503,14 +1510,22 @@ # http://www.xmpp.org/extensions/xep-0145.html notes = storage.getTags('note') for note in notes: - jid = helpers.parse_jid(note.getAttr('jid')) + try: + jid = helpers.parse_jid(note.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % note.getAttr('jid')) + continue annotation = note.getData() self.annotations[jid] = annotation def _rosterSetCB(self, con, iq_obj): gajim.log.debug('rosterSetCB') for item in iq_obj.getTag('query').getChildren(): - jid = helpers.parse_jid(item.getAttr('jid')) + try: + jid = helpers.parse_jid(item.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) + continue name = item.getAttr('name') sub = item.getAttr('subscription') ask = item.getAttr('ask') @@ -1718,7 +1733,11 @@ if addressTag and jid == gajim.get_jid_from_account(self.name): address = addressTag.getTag('address', attrs={'type': 'ofrom'}) if address: - frm = helpers.parse_jid(address.getAttr('jid')) + try: + frm = helpers.parse_jid(address.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % address.getAttr('jid')) + return jid = gajim.get_jid_without_resource(frm) # invitations @@ -1736,7 +1755,11 @@ xtags = msg.getTags('x') for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: - room_jid = helpers.parse_jid(xtag.getAttr('jid')) + try: + room_jid = helpers.parse_jid(xtag.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % xtag.getAttr('jid')) + continue is_continued = False if xtag.getTag('continue'): is_continued = True @@ -1923,7 +1946,11 @@ def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') - jid_from = helpers.parse_jid(item.getAttr('from')) + try: + jid_from = helpers.parse_jid(item.getAttr('from')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) + return reason = item.getTagData('reason') item = invite.getTag('password') password = invite.getTagData('password') @@ -2127,7 +2154,10 @@ r = destroy.getTagData('reason') if r: reason += ' (%s)' % r - jid = helpers.parse_jid(destroy.getAttr('jid')) + try: + jid = helpers.parse_jid(destroy.getAttr('jid')) + except common.helpers.InvalidFormat: + pass if jid: reason += '\n' + _('You can join this room instead: %s') % jid statusCode = ['destroyed'] @@ -2274,7 +2304,11 @@ users_dict = {} for item in items: if item.has_attr('jid') and item.has_attr('affiliation'): - jid = helpers.parse_jid(item.getAttr('jid')) + try: + jid = helpers.parse_jid(item.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) + return affiliation = item.getAttr('affiliation') users_dict[jid] = {'affiliation': affiliation} if item.has_attr('nick'):

1 0

gajim: parse_jid is in helpers
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset a0e7fc97eea9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a0e7fc97eea9 description: parse_jid is in helpers diffstat: src/common/connection_handlers.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (84 lines): diff -r cc607e4378ba -r a0e7fc97eea9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 07 16:34:46 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 07 16:56:04 2009 +0200 @@ -484,7 +484,7 @@ gajim.socks5queue.activate_proxy(host['idx']) break raise common.xmpp.NodeProcessed - jid = gajim.parse_jid(streamhost.getAttr('jid')) + jid = helpers.parse_jid(streamhost.getAttr('jid')) if 'streamhost-used' in file_props and \ file_props['streamhost-used'] is True: raise common.xmpp.NodeProcessed @@ -1122,7 +1122,7 @@ storage = query.getTag('storage') metas = storage.getTags('meta') for meta in metas: - jid = gajim.parse_jid(meta.getAttr('jid')) + jid = helpers.parse_jid(meta.getAttr('jid')) tag = meta.getAttr('tag') data = {'jid': jid} order = meta.getAttr('order') @@ -1483,7 +1483,7 @@ if not print_status: print_status = conf.getTagData('show_status') bm = {'name': conf.getAttr('name'), - 'jid': gajim.parse_jid(conf.getAttr('jid')), + 'jid': helpers.parse_jid(conf.getAttr('jid')), 'autojoin': autojoin_val, 'minimize': minimize_val, 'password': conf.getTagData('password'), @@ -1503,7 +1503,7 @@ # http://www.xmpp.org/extensions/xep-0145.html notes = storage.getTags('note') for note in notes: - jid = gajim.parse_jid(note.getAttr('jid')) + jid = helpers.parse_jid(note.getAttr('jid')) annotation = note.getData() self.annotations[jid] = annotation @@ -1718,7 +1718,7 @@ if addressTag and jid == gajim.get_jid_from_account(self.name): address = addressTag.getTag('address', attrs={'type': 'ofrom'}) if address: - frm = gajim.parse_jid(address.getAttr('jid')) + frm = helpers.parse_jid(address.getAttr('jid')) jid = gajim.get_jid_without_resource(frm) # invitations @@ -1736,7 +1736,7 @@ xtags = msg.getTags('x') for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: - room_jid = gajim.parse_jid(xtag.getAttr('jid')) + room_jid = helpers.parse_jid(xtag.getAttr('jid')) is_continued = False if xtag.getTag('continue'): is_continued = True @@ -1923,7 +1923,7 @@ def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') - jid_from = gajim.parse_jid(item.getAttr('from')) + jid_from = helpers.parse_jid(item.getAttr('from')) reason = item.getTagData('reason') item = invite.getTag('password') password = invite.getTagData('password') @@ -2127,7 +2127,7 @@ r = destroy.getTagData('reason') if r: reason += ' (%s)' % r - jid = gajim.parse_jid(destroy.getAttr('jid')) + jid = helpers.parse_jid(destroy.getAttr('jid')) if jid: reason += '\n' + _('You can join this room instead: %s') % jid statusCode = ['destroyed'] @@ -2274,7 +2274,7 @@ users_dict = {} for item in items: if item.has_attr('jid') and item.has_attr('affiliation'): - jid = gajim.parse_jid(item.getAttr('jid')) + jid = helpers.parse_jid(item.getAttr('jid')) affiliation = item.getAttr('affiliation') users_dict[jid] = {'affiliation': affiliation} if item.has_attr('nick'):

1 0

gajim: fix some bugs with non-normalized jids
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset cc607e4378ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc607e4378ba description: fix some bugs with non-normalized jids diffstat: src/common/connection_handlers.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (84 lines): diff -r d1f8de8f7da8 -r cc607e4378ba src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 07 14:27:55 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 07 16:34:46 2009 +0200 @@ -484,7 +484,7 @@ gajim.socks5queue.activate_proxy(host['idx']) break raise common.xmpp.NodeProcessed - jid = streamhost.getAttr('jid') + jid = gajim.parse_jid(streamhost.getAttr('jid')) if 'streamhost-used' in file_props and \ file_props['streamhost-used'] is True: raise common.xmpp.NodeProcessed @@ -1122,7 +1122,7 @@ storage = query.getTag('storage') metas = storage.getTags('meta') for meta in metas: - jid = meta.getAttr('jid') + jid = gajim.parse_jid(meta.getAttr('jid')) tag = meta.getAttr('tag') data = {'jid': jid} order = meta.getAttr('order') @@ -1483,7 +1483,7 @@ if not print_status: print_status = conf.getTagData('show_status') bm = {'name': conf.getAttr('name'), - 'jid': conf.getAttr('jid'), + 'jid': gajim.parse_jid(conf.getAttr('jid')), 'autojoin': autojoin_val, 'minimize': minimize_val, 'password': conf.getTagData('password'), @@ -1503,7 +1503,7 @@ # http://www.xmpp.org/extensions/xep-0145.html notes = storage.getTags('note') for note in notes: - jid = note.getAttr('jid') + jid = gajim.parse_jid(note.getAttr('jid')) annotation = note.getData() self.annotations[jid] = annotation @@ -1718,7 +1718,7 @@ if addressTag and jid == gajim.get_jid_from_account(self.name): address = addressTag.getTag('address', attrs={'type': 'ofrom'}) if address: - frm = address.getAttr('jid') + frm = gajim.parse_jid(address.getAttr('jid')) jid = gajim.get_jid_without_resource(frm) # invitations @@ -1736,7 +1736,7 @@ xtags = msg.getTags('x') for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: - room_jid = xtag.getAttr('jid') + room_jid = gajim.parse_jid(xtag.getAttr('jid')) is_continued = False if xtag.getTag('continue'): is_continued = True @@ -1923,7 +1923,7 @@ def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') - jid_from = item.getAttr('from') + jid_from = gajim.parse_jid(item.getAttr('from')) reason = item.getTagData('reason') item = invite.getTag('password') password = invite.getTagData('password') @@ -2127,7 +2127,7 @@ r = destroy.getTagData('reason') if r: reason += ' (%s)' % r - jid = destroy.getAttr('jid') + jid = gajim.parse_jid(destroy.getAttr('jid')) if jid: reason += '\n' + _('You can join this room instead: %s') % jid statusCode = ['destroyed'] @@ -2274,7 +2274,7 @@ users_dict = {} for item in items: if item.has_attr('jid') and item.has_attr('affiliation'): - jid = item.getAttr('jid') + jid = gajim.parse_jid(item.getAttr('jid')) affiliation = item.getAttr('affiliation') users_dict[jid] = {'affiliation': affiliation} if item.has_attr('nick'):

1 0

gajim: add gajim.svg in /usr/share/pixmaps. Fixes #5139
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset d1f8de8f7da8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1f8de8f7da8 description: add gajim.svg in /usr/share/pixmaps. Fixes #5139 diffstat: data/pixmaps/Makefile.am | 3 +- data/pixmaps/gajim.svg | 444 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 446 insertions(+), 1 deletions(-) diffs (truncated from 460 to 300 lines): diff -r 6c5fa8be3e1b -r d1f8de8f7da8 data/pixmaps/Makefile.am --- a/data/pixmaps/Makefile.am Tue Jul 07 13:41:05 2009 +0200 +++ b/data/pixmaps/Makefile.am Tue Jul 07 14:27:55 2009 +0200 @@ -12,6 +12,7 @@ gajimpixmapdir = $(datadir)/pixmaps gajimpixmap_DATA = gajim.png \ - gajim_about.png + gajim.svg \ + gajim_about.png MAINTAINERCLEANFILES = Makefile.in diff -r 6c5fa8be3e1b -r d1f8de8f7da8 data/pixmaps/gajim.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/pixmaps/gajim.svg Tue Jul 07 14:27:55 2009 +0200 @@ -0,0 +1,444 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg4023" + sodipodi:version="0.32" + inkscape:version="0.44+devel" + sodipodi:docname="gajim-48x48.svg" + sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources/tangoified-logo" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/cornelius/gajim.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4025"> + <linearGradient + inkscape:collect="always" + id="linearGradient3106"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3108" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3110" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3121"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3123" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3125" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3103"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop3105" /> + <stop + style="stop-color:#4e9a06;stop-opacity:1" + offset="1" + id="stop3107" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3223"> + <stop + style="stop-color:#729fcf;stop-opacity:1;" + offset="0" + id="stop3225" /> + <stop + style="stop-color:#396ea7;stop-opacity:1" + offset="1" + id="stop3227" /> + </linearGradient> + <linearGradient + id="linearGradient3128" + inkscape:collect="always"> + <stop + id="stop3130" + offset="0" + style="stop-color:#fef291;stop-opacity:1" /> + <stop + id="stop3132" + offset="1" + style="stop-color:#edd400;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3112"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3114" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3116" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3096"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3098" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3100" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3080"> + <stop + style="stop-color:#ad7fa8;stop-opacity:1" + offset="0" + id="stop3082" /> + <stop + style="stop-color:#75507b;stop-opacity:1" + offset="1" + id="stop3084" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3951" + id="linearGradient3957" + x1="16" + y1="2" + x2="32.927006" + y2="31.587952" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3951"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3953" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3955" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3951" + id="linearGradient3092" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-1,3)" + x1="18.107143" + y1="53.76825" + x2="8.4828358" + y2="3.3976703" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3096" + id="radialGradient3102" + cx="23.081985" + cy="42.747208" + fx="23.081985" + fy="42.747208" + r="16.010918" + gradientTransform="matrix(1,0,0,0.119874,0,37.62294)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3080" + id="radialGradient3104" + cx="17.309582" + cy="24.508204" + fx="17.309582" + fy="24.508204" + r="17.031612" + gradientTransform="matrix(2.13216,1.122823e-2,-1.1822e-2,2.244913,-18.75993,-30.16344)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3112" + id="linearGradient3118" + x1="24.260687" + y1="2.5335035" + x2="24.832115" + y2="22.012075" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3128" + id="radialGradient3120" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.705883,0,0,1.667238,-17.94118,-19.21085)" + cx="21.142859" + cy="22.17857" + fx="21.142859" + fy="22.17857" + r="9" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3128" + id="radialGradient3221" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.999999,0,0,1.000342,1.223408e-6,-8.326495)" + cx="21.142859" + cy="22.17857" + fx="21.142859" + fy="22.17857" + r="9" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223" + id="linearGradient3229" + x1="24.000008" + y1="31.785711" + x2="30.00001" + y2="38.499996" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.679906,0,0,0.709362,7.683475,1.608315)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3103" + id="radialGradient3109" + cx="15.269456" + cy="24.907877" + fx="15.269456" + fy="24.907877" + r="19" + gradientTransform="matrix(1.989063,0,0,1.427178,-17.28077,-7.054682)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3951" + id="linearGradient3111" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.258493,0,0,1.2607,-6.203794,1.409664)" + x1="16" + y1="2" + x2="38.465416" + y2="42.405006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3951" + id="linearGradient3115" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.258493,0,0,1.260118,-6.203794,-0.58013)" + x1="16" + y1="2" + x2="38.465416" + y2="42.405006" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3103" + id="radialGradient3117" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.989063,0,0,1.76923,-17.28077,-17.61162)" + cx="16.488304" + cy="23.537582" + fx="16.488304" + fy="23.537582" + r="19" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3121" + id="radialGradient3127" + cx="23.991123" + cy="44.514973" + fx="23.991123" + fy="44.514973" + r="20.85965" + gradientTransform="matrix(1,0,0,0.16707,0,37.07785)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3106" + id="linearGradient3113" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1,0)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3106" + id="linearGradient3116" + x1="15.571428" + y1="29.99917"

1 0

gajim: don't traceback when we receive pep info from muc
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 6c5fa8be3e1b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6c5fa8be3e1b description: don't traceback when we receive pep info from muc diffstat: src/common/connection_handlers.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 8e8c571c93a3 -r 6c5fa8be3e1b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jul 05 11:57:12 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 07 13:41:05 2009 +0200 @@ -1695,8 +1695,11 @@ '''Called when we receive a message''' gajim.log.debug('MessageCB') + mtype = msg.getType() # check if the message is pubsub#event if msg.getTag('event') is not None: + if mtype == 'groupchat': + return if msg.getTag('error') is None: self._pubsubEventCB(con, msg) return @@ -1741,7 +1744,6 @@ is_continued)) return - mtype = msg.getType() thread_id = msg.getThread() if not mtype:

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
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