Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: Merge changes from default branch to osx_newbuildsys branch.
by Jonathan Schleifer 07 Jul '09

07 Jul '09

changeset 693e4cdeb587 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=693e4cdeb587 description: Merge changes from default branch to osx_newbuildsys branch. diffstat: data/pixmaps/Makefile | 2 +- data/pixmaps/gajim.svg | 444 ++++++++++++++++++++++++++++++++++++++++ src/common/connection.py | 19 + src/common/connection_handlers.py | 37 +- src/common/socks5.py | 1 + src/roster_window.py | 27 ++- 6 files changed, 509 insertions(+), 21 deletions(-) diffs (truncated from 681 to 300 lines): diff -r 4b15efdffcb1 -r 693e4cdeb587 data/pixmaps/Makefile --- a/data/pixmaps/Makefile Thu Jul 02 12:50:26 2009 +0200 +++ b/data/pixmaps/Makefile Tue Jul 07 22:48:02 2009 +0200 @@ -1,7 +1,7 @@ include ../../buildsys.mk install-extra: - for i in *.bmp *.icns *.ico *.png agents/*.png dock_icns/*.icns events/*.png; do \ + for i in *.bmp *.icns *.ico *.png *.svg agents/*.png dock_icns/*.icns events/*.png; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$i; then \ ${INSTALL_OK}; \ diff -r 4b15efdffcb1 -r 693e4cdeb587 data/pixmaps/gajim.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/pixmaps/gajim.svg Tue Jul 07 22:48:02 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: get_full_jid_from_iq is in helpers. Fixes #5146
by Yann Leboulanger 07 Jul '09

07 Jul '09

changeset f587ef9ef128 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f587ef9ef128 description: get_full_jid_from_iq is in helpers. Fixes #5146 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8a2a8b89a2f1 -r f587ef9ef128 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 Tue Jul 07 19:17:28 2009 +0200 @@ -1778,7 +1778,7 @@ def _rosterItemExchangeCB(self, con, msg): ''' XEP-0144 Roster Item Echange ''' exchange_items_list = {} - jid_from = gajim.get_full_jid_from_iq(msg) + jid_from = helpers.get_full_jid_from_iq(msg) items_list = msg.getTag('x').getChildren() action = items_list[0].getAttr('action') if action == None:

1 0

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

07 Jul '09

changeset 8a2a8b89a2f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a2a8b89a2f1 description: parse_jid is in helpers diffstat: src/common/connection_handlers.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diffs (93 lines): diff -r a65ad1344ce7 -r 8a2a8b89a2f1 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 @@ -497,7 +497,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 @@ -1150,7 +1150,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') @@ -1519,7 +1519,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'), @@ -1539,7 +1539,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 @@ -1785,7 +1785,7 @@ action = 'add' for item in msg.getTag('x', namespace=common.xmpp.NS_ROSTERX).getChildren(): - jid = gajim.parse_jid(item.getAttr('jid')) + jid = helpers.parse_jid(item.getAttr('jid')) name = item.getAttr('name') groups=[] for group in item.getTags('group'): @@ -1832,7 +1832,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 @@ -1850,7 +1850,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 @@ -2050,7 +2050,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') @@ -2254,7 +2254,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'] @@ -2401,7 +2401,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 07 Jul '09

07 Jul '09

changeset a65ad1344ce7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a65ad1344ce7 description: fix some bugs with non-normalized jids diffstat: src/common/connection_handlers.py | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diffs (101 lines): diff -r 5f154c48e9db -r a65ad1344ce7 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 07 16:28:26 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 07 16:34:46 2009 +0200 @@ -497,7 +497,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 @@ -1150,7 +1150,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') @@ -1519,7 +1519,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'), @@ -1539,7 +1539,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 @@ -1778,14 +1778,14 @@ def _rosterItemExchangeCB(self, con, msg): ''' XEP-0144 Roster Item Echange ''' exchange_items_list = {} - jid_from = msg.getAttr('from') + jid_from = gajim.get_full_jid_from_iq(msg) items_list = msg.getTag('x').getChildren() action = items_list[0].getAttr('action') if action == None: action = 'add' for item in msg.getTag('x', namespace=common.xmpp.NS_ROSTERX).getChildren(): - jid = item.getAttr('jid') + jid = gajim.parse_jid(item.getAttr('jid')) name = item.getAttr('name') groups=[] for group in item.getTags('group'): @@ -1832,7 +1832,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 @@ -1850,7 +1850,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 @@ -2050,7 +2050,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') @@ -2254,7 +2254,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'] @@ -2401,7 +2401,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: ability to send contacts via DnD to another contact. Fixe...
by Yann Leboulanger 07 Jul '09

07 Jul '09

changeset 5f154c48e9db in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f154c48e9db description: ability to send contacts via DnD to another contact. Fixes #378 diffstat: src/common/connection.py | 19 +++++++++++++++++++ src/common/connection_handlers.py | 11 ++++++----- src/roster_window.py | 27 ++++++++++++++++++++++++--- 3 files changed, 49 insertions(+), 8 deletions(-) diffs (104 lines): diff -r ec66229255dc -r 5f154c48e9db src/common/connection.py --- a/src/common/connection.py Tue Jul 07 14:27:55 2009 +0200 +++ b/src/common/connection.py Tue Jul 07 16:28:26 2009 +0200 @@ -1364,6 +1364,25 @@ if callback: callback(msg_id, *callback_args) + def send_contacts(self, contacts, jid): + '''Send contacts with RosterX (Xep-0144)''' + if not self.connection: + return + if len(contacts) == 1: + msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), + contacts[0].get_shown_name()) + else: + msg = _('Sent contacts:') + for contact in contacts: + msg += '\n "%s" (%s)' % (contact.get_full_jid(), + contact.get_shown_name()) + msg_iq = common.xmpp.Message(to=jid, body=msg) + x = msg_iq.addChild(name='x', namespace=common.xmpp.NS_ROSTERX) + for contact in contacts: + x.addChild(name='item', attrs={'action': 'add', 'jid': contact.jid, + 'name': contact.get_shown_name()}) + self.connection.send(msg_iq) + def send_stanza(self, stanza): ''' send a stanza untouched ''' if not self.connection: diff -r ec66229255dc -r 5f154c48e9db 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:28:26 2009 +0200 @@ -1783,11 +1783,12 @@ action = items_list[0].getAttr('action') if action == None: action = 'add' - for item in msg.getTag('x').getChildren(): + for item in msg.getTag('x', + namespace=common.xmpp.NS_ROSTERX).getChildren(): jid = item.getAttr('jid') name = item.getAttr('name') groups=[] - for group in item.getChildren(): + for group in item.getTags('group'): groups.append(group.getData()) exchange_items_list[jid] = [] exchange_items_list[jid].append(name) @@ -1809,9 +1810,9 @@ return # check if the message is a roster item exchange (XEP-0144) - #if msg.getTag('x') and msg.getTag('x').namespace == common.xmpp.NS_ROSTERX: - #self._rosterItemExchangeCB(con, msg) - #return + if msg.getTag('x', namespace=common.xmpp.NS_ROSTERX): + self._rosterItemExchangeCB(con, msg) + return # check if the message is a XEP-0070 confirmation request if msg.getTag('confirm', namespace=common.xmpp.NS_HTTP_AUTH): diff -r ec66229255dc -r 5f154c48e9db src/roster_window.py --- a/src/roster_window.py Tue Jul 07 14:27:55 2009 +0200 +++ b/src/roster_window.py Tue Jul 07 16:28:26 2009 +0200 @@ -3767,6 +3767,10 @@ def drag_end(self, treeview, context): self.dragging = False + def on_drop_rosterx(self, widget, account_source, c_source, account_dest, + c_dest, was_big_brother, context, etime): + gajim.connections[account_dest].send_contacts([c_source], c_dest.jid) + def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): @@ -4089,9 +4093,26 @@ if not c_dest: # c_dest is None if jid_dest doesn't belong to account return - self.on_drop_in_contact(treeview, account_source, c_source, - account_dest, c_dest, is_big_brother, context, etime) - return + menu = gtk.Menu() + item = gtk.MenuItem(_('Send %s to %s') % (c_source.get_shown_name(), + c_dest.get_shown_name())) + item.connect('activate', self.on_drop_rosterx, account_source, + c_source, account_dest, c_dest, is_big_brother, context, etime) + menu.append(item) + + item = gtk.MenuItem(_('Make %s and %s metacontacts') % ( + c_source.get_shown_name(), c_dest.get_shown_name())) + item.connect('activate', self.on_drop_in_contact, account_source, + c_source, account_dest, c_dest, is_big_brother, context, etime) + + menu.append(item) + + menu.attach_to_widget(self.tree, None) + menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() + menu.popup(None, None, None, 1, etime) +# self.on_drop_in_contact(treeview, account_source, c_source, +# account_dest, c_dest, is_big_brother, context, etime) ################################################################################ ### Everything about images and icons....

1 0

gajim: * fixed a bug when we remove a contact from our contact l...
by Anaël Verrier 07 Jul '09

07 Jul '09

changeset 463ed527e1d7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=463ed527e1d7 description: * fixed a bug when we remove a contact from our contact list (before we did not remove contact from roster_group table) diffstat: src/common/logger.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r f5b5c2a0ca4c -r 463ed527e1d7 src/common/logger.py --- a/src/common/logger.py Mon Jul 06 22:34:24 2009 +0200 +++ b/src/common/logger.py Tue Jul 07 15:14:56 2009 +0200 @@ -858,6 +858,8 @@ jid_id = self.get_jid_id(jid) except exceptions.PysqliteOperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) + sql = 'DELETE FROM roster_group WHERE account_jid_id=%d AND jid_id=%d' % (account_jid_id, jid_id) + self.cur.execute(sql) sql = 'DELETE FROM roster_entry WHERE account_jid_id=%d AND jid_id=%d' % (account_jid_id, jid_id) self.simple_commit(sql)

1 0

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

07 Jul '09

changeset ec66229255dc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec66229255dc 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 02c2d23c05e8 -r ec66229255dc 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 02c2d23c05e8 -r ec66229255dc 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 07 Jul '09

07 Jul '09

changeset 02c2d23c05e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02c2d23c05e8 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 ac31cbdfda85 -r 02c2d23c05e8 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 @@ -1799,8 +1799,11 @@ '''Called when we receive a message''' 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 @@ -1854,7 +1857,6 @@ is_continued)) return - mtype = msg.getType() thread_id = msg.getThread() if not mtype:

1 0

gajim: * fixed a bug when we have a groupchat minimized in the r...
by Anaël Verrier 06 Jul '09

06 Jul '09

changeset f5b5c2a0ca4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f5b5c2a0ca4c description: * fixed a bug when we have a groupchat minimized in the roster diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 32f971500155 -r f5b5c2a0ca4c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jun 30 17:06:17 2009 +0200 +++ b/src/common/connection_handlers.py Mon Jul 06 22:34:24 2009 +0200 @@ -2494,7 +2494,7 @@ gajim.logger.replace_roster(self.name, roster_version, roster) if received_from_server: for contact in gajim.contacts.iter_contacts(self.name): - if contact.jid not in roster: + if not contact.is_groupchat() and contact.jid not in roster: self.dispatch('ROSTER_INFO', (self.name, (contact.jid, None, None, None, ()))) for jid in roster:

1 0

gajim: put connect() into connections.py
by Ummu 06 Jul '09

06 Jul '09

changeset f6bd1672e3c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f6bd1672e3c1 description: put connect() into connections.py diffstat: src/common/connection.py | 9 ++++++++- src/whiteboardwidget.py | 15 +++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diffs (58 lines): diff -r dea6760d1bb5 -r f6bd1672e3c1 src/common/connection.py --- a/src/common/connection.py Mon Jul 06 08:06:10 2009 +0200 +++ b/src/common/connection.py Mon Jul 06 01:18:22 2009 -0700 @@ -1951,7 +1951,14 @@ self.connection.SendAndCallForResponse(iq, _on_response) - def send_sxe(self, message): + def send_whiteboard_connect(self, jid, sid): + + message = common.xmpp.Node(node="<message to='%s' xmlns='jabber:client'/>" + % jid) + sxe = message.addChild(name='sxe', attrs={'session':sid}, + namespace='urn:xmpp:tmp:sxe') + sxe.addChild(name='connect') + self.connection.send(message) # END Connection diff -r dea6760d1bb5 -r f6bd1672e3c1 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Mon Jul 06 08:06:10 2009 +0200 +++ b/src/whiteboardwidget.py Mon Jul 06 01:18:22 2009 -0700 @@ -100,7 +100,7 @@ print 'test' if event.keyval == 'p': self.image.print_xml() - + class SVGObject(): ''' A class to store the svg document and make changes to it. Stores items in a tuple that's (minidom node, goocanvas object).''' @@ -158,7 +158,6 @@ self.sid = ''.join([choice(chars) for i in range(7)]) else: self.sid = sid - self.connect() def rid(self): rid = str(self.last_rid) @@ -167,16 +166,8 @@ def connect(self): # connect to the message - - # FIXME Create a function in src/common/connection.py - message = Node(node="<message to='%s' xmlns='jabber:client'/>" - % self.contact.get_full_jid()) - sxe = message.addChild(name='sxe', attrs={'session':self.sid}, - namespace='urn:xmpp:tmp:sxe') - sxe.addChild(name='connect') - - gajim.connections[self.account].send_sxe(message) - + gajim.connections[self.account].send_whiteboard_connect( + self.contact.get_full_jid(), self.sid) def encode(self, xml): # encodes it sendable string

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