Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8675 - branches/gajim_0.11.1/src/common/xmpp
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:40:11 +0200 (Fri, 31 Aug 2007) New Revision: 8675 Modified: branches/gajim_0.11.1/src/common/xmpp/features_nb.py Log: Do not use xmpppy DataForm class Modified: branches/gajim_0.11.1/src/common/xmpp/features_nb.py =================================================================== --- branches/gajim_0.11.1/src/common/xmpp/features_nb.py 2007-08-31 16:31:23 UTC (rev 8674) +++ branches/gajim_0.11.1/src/common/xmpp/features_nb.py 2007-08-31 16:40:11 UTC (rev 8675) @@ -128,16 +128,13 @@ return df=tag.getTag('x',namespace=NS_DATA) if df: - con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,DataForm(node=df),True,'')) + con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,df,True,'')) return - df=DataForm(typ='form') + df={} for i in resp.getQueryPayload(): if not isinstance(i, Node): - pass - elif i.getName()=='instructions': - df.addInstructions(i.getData()) - else: - df.setField(i.getName()).setValue(i.getData()) + continue + df[i.getName()] = i.getData() con.Event(NS_REGISTER, REGISTER_DATA_RECEIVED, (agent,df,False,'')) def register(disp, host, info, cb):

1 0

[commit-gajim] r8674 - branches/gajim_0.11.1/src/common/xmpp
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:31:23 +0200 (Fri, 31 Aug 2007) New Revision: 8674 Modified: branches/gajim_0.11.1/src/common/xmpp/commands.py Log: [elghinn] xmpppy typo Modified: branches/gajim_0.11.1/src/common/xmpp/commands.py =================================================================== --- branches/gajim_0.11.1/src/common/xmpp/commands.py 2007-08-31 16:28:52 UTC (rev 8673) +++ branches/gajim_0.11.1/src/common/xmpp/commands.py 2007-08-31 16:31:23 UTC (rev 8674) @@ -87,7 +87,7 @@ elif self._handlers[''].has_key(node): self._handlers[''][node]['execute'](conn,request) else: - conn.send(Error(requet,ERR_ITEM_NOT_FOUND)) + conn.send(Error(request,ERR_ITEM_NOT_FOUND)) raise NodeProcessed def _DiscoHandler(self,conn,request,typ):

1 0

[commit-gajim] r8673 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:28:52 +0200 (Fri, 31 Aug 2007) New Revision: 8673 Modified: branches/gajim_0.11.1/src/common/connection_handlers.py Log: [elghinn] fix disco#items without node Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 16:28:31 UTC (rev 8672) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 16:28:52 UTC (rev 8673) @@ -684,6 +684,10 @@ def _DiscoverItemsGetCB(self, con, iq_obj): gajim.log.debug('DiscoverItemsGetCB') node = iq_obj.getTagAttr('query', 'node') + if node is None: + result = iq_obj.buildReply('result') + self.connection.send(result) + raise common.xmpp.NodeProcessed if node==common.xmpp.NS_COMMANDS: self.commandListQuery(con, iq_obj) raise common.xmpp.NodeProcessed

1 0

[commit-gajim] r8672 - in branches/gajim_0.11.1/src/common: . xmpp
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:28:31 +0200 (Fri, 31 Aug 2007) New Revision: 8672 Modified: branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/common/connection_handlers.py branches/gajim_0.11.1/src/common/xmpp/protocol.py Log: [elghinn] fix entity time support (xep 90 and 202) Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-31 16:26:38 UTC (rev 8671) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-31 16:28:31 UTC (rev 8672) @@ -727,7 +727,7 @@ ' ([This message is *encrypted* (See :JEP:`27`])' else: # Encryption failed, do not send message - tim = time.localtime() + tim = localtime() self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim)) return 3 if msgtxt and not xhtml and gajim.config.get( @@ -1098,7 +1098,7 @@ self.connection.send(p) # Save the time we quit to avoid duplicate logs AND be faster than # get that date from DB - self.last_history_line[jid] = time.time() + self.last_history_line[jid] = time_time() def gc_set_role(self, room_jid, nick, role, reason = ''): '''role is for all the life of the room so it's based on nick''' Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 16:26:38 UTC (rev 8671) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 16:28:31 UTC (rev 8672) @@ -18,13 +18,13 @@ ## import os -import time import base64 import sha import socket import sys -from time import localtime, strftime, gmtime +from time import (altzone, daylight, gmtime, localtime, mktime, strftime, + strptime, time as time_time, timezone, tzname) from calendar import timegm import socks5 @@ -396,7 +396,7 @@ def _ResultCB(self, con, iq_obj): gajim.log.debug('_ResultCB') - # if we want to respect jep-0065 we have to check for proxy + # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = unicode(iq_obj.getAttr('id')) if real_id[:3] != 'au_': @@ -570,12 +570,12 @@ class ConnectionDisco: ''' hold xmpppy handlers and public methods for discover services''' def discoverItems(self, jid, node = None, id_prefix = None): - '''According to JEP-0030: jid is mandatory, + '''According to XEP-0030: jid is mandatory, name, node, action is optional.''' self._discover(common.xmpp.NS_DISCO_ITEMS, jid, node, id_prefix) def discoverInfo(self, jid, node = None, id_prefix = None): - '''According to JEP-0030: + '''According to XEP-0030: For identity: category, type is mandatory, name is optional. For feature: var is mandatory''' self._discover(common.xmpp.NS_DISCO_INFO, jid, node, id_prefix) @@ -722,6 +722,9 @@ if (node is None or extension == 'xhtml') and not gajim.config.get('ignore_incoming_xhtml'): q.addChild('feature', attrs = {'var': common.xmpp.NS_XHTML_IM}) + if node is None: + q.addChild('feature', attrs = {'var': common.xmpp.NS_TIME_REVISED}) + if q.getChildren(): self.connection.send(iq) raise common.xmpp.NodeProcessed @@ -733,7 +736,7 @@ def _DiscoverInfoCB(self, con, iq_obj): gajim.log.debug('DiscoverInfoCB') - # According to JEP-0030: + # According to XEP-0030: # For identity: category, type is mandatory, name is optional. # For feature: var is mandatory identities, features, data = [], [], [] @@ -799,7 +802,7 @@ return p def add_caps(self, p): - ''' advertise our capabilities in presence stanza (jep-0115)''' + ''' advertise our capabilities in presence stanza (xep-0115)''' c = p.setTag('c', namespace = common.xmpp.NS_CAPS) c.setAttr('node', 'http://gajim.org/caps') ext = [] @@ -1008,7 +1011,7 @@ elif self.awaiting_answers[id][0] == METACONTACTS_ARRIVED: if iq_obj.getType() == 'result': # Metacontact tags - # http://www.jabber.org/jeps/jep-XXXX.html + # http://www.xmpp.org/extensions/xep-0209.html meta_list = {} query = iq_obj.getTag('query') storage = query.getTag('storage') @@ -1179,7 +1182,7 @@ def _PrivateCB(self, con, iq_obj): ''' - Private Data (JEP 048 and 049) + Private Data (XEP 048 and 049) ''' gajim.log.debug('PrivateCB') query = iq_obj.getTag('query') @@ -1188,7 +1191,7 @@ ns = storage.getNamespace() if ns == 'storage:bookmarks': # Bookmarked URLs and Conferences - # http://www.jabber.org/jeps/jep-0048.html + # http://www.xmpp.org/extensions/xep-0048.html confs = storage.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') @@ -1209,7 +1212,7 @@ elif ns == 'gajim:prefs': # Preferences data - # http://www.jabber.org/jeps/jep-0049.html + # http://www.xmpp.org/extensions/xep-0049.html #TODO: implement this pass elif ns == 'storage:rosternotes': @@ -1229,7 +1232,7 @@ ns = storage_tag.getNamespace() if ns == 'storage:metacontacts': self.metacontacts_supported = False - # Private XML Storage (JEP49) is not supported by server + # Private XML Storage (XEP49) is not supported by server # Continue connecting self.connection.initRoster() @@ -1302,18 +1305,21 @@ gajim.log.debug('TimeCB') iq_obj = iq_obj.buildReply('result') qp = iq_obj.getTag('query') - qp.setTagData('utc', strftime("%Y%m%dT%T", gmtime())) - qp.setTagData('tz', strftime("%Z", gmtime())) - qp.setTagData('display', strftime("%c", localtime())) + qp.setTagData('utc', strftime('%Y%m%dT%T', gmtime())) + qp.setTagData('tz', tzname[daylight]) + qp.setTagData('display', strftime('%c', localtime())) self.connection.send(iq_obj) raise common.xmpp.NodeProcessed def _TimeRevisedCB(self, con, iq_obj): gajim.log.debug('TimeRevisedCB') iq_obj = iq_obj.buildReply('result') - qp = iq_obj.setTag('time') - qp.setTagData('utc', strftime("%Y-%m-%dT%TZ", gmtime())) - qp.setTagData('tzo', "%+03d:00"% (-time.timezone/(60*60))) + qp = iq_obj.setTag('time', + namespace=common.xmpp.NS_TIME_REVISED) + qp.setTagData('utc', strftime('%Y-%m-%dT%TZ', gmtime())) + zone = -(timezone, altzone)[daylight] / 60 + tzo = (zone / 60, abs(zone % 60)) + qp.setTagData('tzo', '%+03d:%02d' % (tzo)) self.connection.send(iq_obj) raise common.xmpp.NodeProcessed @@ -1375,8 +1381,8 @@ mtype = msg.getType() subject = msg.getSubject() # if not there, it's None tim = msg.getTimestamp() - tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') - tim = time.localtime(timegm(tim)) + tim = strptime(tim, '%Y%m%dT%H:%M:%S') + tim = localtime(timegm(tim)) frm = helpers.get_full_jid_from_iq(msg) jid = helpers.get_jid_from_iq(msg) no_log_for = gajim.config.get_per('accounts', self.name, @@ -1396,10 +1402,10 @@ invite = None delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None msg_id = None - composing_jep = None + composing_xep = None # FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) do NOT RECOMMENDED # invitation - # stanza (MUC JEP) remove in 2007, as we do not do NOT RECOMMENDED + # stanza (MUC XEP) remove in 2007, as we do not do NOT RECOMMENDED xtags = msg.getTags('x') for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: @@ -1408,22 +1414,22 @@ return # chatstates - look for chatstate tags in a message if not delayed if not delayed: - composing_jep = False + composing_xep = False children = msg.getChildren() for child in children: if child.getNamespace() == 'http://jabber.org/protocol/chatstates': chatstate = child.getName() - composing_jep = 'JEP-0085' + composing_xep = 'XEP-0085' break - # No JEP-0085 support, fallback to JEP-0022 + # No XEP-0085 support, fallback to XEP-0022 if not chatstate: chatstate_child = msg.getTag('x', namespace = common.xmpp.NS_EVENT) if chatstate_child: chatstate = 'active' - composing_jep = 'JEP-0022' + composing_xep = 'XEP-0022' if not msgtxt and chatstate_child.getTag('composing'): chatstate = 'composing' - # JEP-0172 User Nickname + # XEP-0172 User Nickname user_nick = msg.getTagData('nick') if not user_nick: user_nick = '' @@ -1465,7 +1471,7 @@ if not self.last_history_line.has_key(jid): return self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, msghtml)) - if self.name not in no_log_for and not int(float(time.mktime(tim)))\ + if self.name not in no_log_for and not int(float(mktime(tim)))\ <= self.last_history_line[jid] and msgtxt: try: gajim.logger.write('gc_msg', frm, msgtxt, tim = tim) @@ -1502,7 +1508,7 @@ if treat_as: mtype = treat_as self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, - subject, chatstate, msg_id, composing_jep, user_nick, msghtml)) + subject, chatstate, msg_id, composing_xep, user_nick, msghtml)) # END messageCB def _pubsubEventCB(self, con, msg): @@ -1556,7 +1562,7 @@ is_gc = False # is it a GC presence ? sigTag = None avatar_sha = None - # JEP-0172 User Nickname + # XEP-0172 User Nickname user_nick = prs.getTagData('nick') if not user_nick: user_nick = '' @@ -1573,10 +1579,10 @@ avatar_sha = x.getTagData('photo') contact_nickname = x.getTagData('nickname') elif namespace == common.xmpp.NS_DELAY: - # JEP-0091 + # XEP-0091 tim = prs.getTimestamp() - tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') - timestamp = time.localtime(timegm(tim)) + tim = strptime(tim, '%Y%m%dT%H:%M:%S') + timestamp = localtime(timegm(tim)) if namespace == 'http://delx.cjb.net/protocol/roster-subsync': # see http://trac.gajim.org/ticket/326 agent = gajim.get_server_from_jid(jid_stripped) @@ -1711,10 +1717,10 @@ # detect a subscription loop if not self.subscribed_events.has_key(jid_stripped): self.subscribed_events[jid_stripped] = [] - self.subscribed_events[jid_stripped].append(time.time()) + self.subscribed_events[jid_stripped].append(time_time()) block = False if len(self.subscribed_events[jid_stripped]) > 5: - if time.time() - self.subscribed_events[jid_stripped][0] < 5: + if time_time() - self.subscribed_events[jid_stripped][0] < 5: block = True self.subscribed_events[jid_stripped] = self.subscribed_events[jid_stripped][1:] if block: @@ -1731,10 +1737,10 @@ # detect a unsubscription loop if not self.subscribed_events.has_key(jid_stripped): self.subscribed_events[jid_stripped] = [] - self.subscribed_events[jid_stripped].append(time.time()) + self.subscribed_events[jid_stripped].append(time_time()) block = False if len(self.subscribed_events[jid_stripped]) > 5: - if time.time() - self.subscribed_events[jid_stripped][0] < 5: + if time_time() - self.subscribed_events[jid_stripped][0] < 5: block = True self.subscribed_events[jid_stripped] = self.subscribed_events[jid_stripped][1:] if block: Modified: branches/gajim_0.11.1/src/common/xmpp/protocol.py =================================================================== --- branches/gajim_0.11.1/src/common/xmpp/protocol.py 2007-08-31 16:26:38 UTC (rev 8671) +++ branches/gajim_0.11.1/src/common/xmpp/protocol.py 2007-08-31 16:28:31 UTC (rev 8672) @@ -21,71 +21,71 @@ from simplexml import Node,NodeBuilder,ustr import time -NS_ACTIVITY ='http://jabber.org/protocol/activity' # JEP-0108 -NS_ADDRESS ='http://jabber.org/protocol/address' # JEP-0033 +NS_ACTIVITY ='http://jabber.org/protocol/activity' # XEP-0108 +NS_ADDRESS ='http://jabber.org/protocol/address' # XEP-0033 NS_AGENTS ='jabber:iq:agents' NS_AMP ='http://jabber.org/protocol/amp' NS_AMP_ERRORS =NS_AMP+'#errors' NS_AUTH ='jabber:iq:auth' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' NS_BROWSE ='jabber:iq:browse' -NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065 -NS_CAPS ='http://jabber.org/protocol/caps' # JEP-0115 -NS_CHATSTATES ='http://jabber.org/protocol/chatstates' # JEP-0085 +NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # XEP-0065 +NS_CAPS ='http://jabber.org/protocol/caps' # XEP-0115 +NS_CHATSTATES ='http://jabber.org/protocol/chatstates' # XEP-0085 NS_CLIENT ='jabber:client' NS_COMMANDS ='http://jabber.org/protocol/commands' NS_COMPONENT_ACCEPT='jabber:component:accept' NS_COMPONENT_1 ='http://jabberd.jabberstudio.org/ns/component/1.0' -NS_COMPRESS ='http://jabber.org/protocol/compress' # JEP-0138 +NS_COMPRESS ='http://jabber.org/protocol/compress' # XEP-0138 NS_CONFERENCE ='jabber:x:conference' -NS_DATA ='jabber:x:data' # JEP-0004 +NS_DATA ='jabber:x:data' # XEP-0004 NS_DELAY ='jabber:x:delay' NS_DIALBACK ='jabber:server:dialback' NS_DISCO ='http://jabber.org/protocol/disco' NS_DISCO_INFO =NS_DISCO+'#info' NS_DISCO_ITEMS =NS_DISCO+'#items' -NS_ENCRYPTED ='jabber:x:encrypted' # JEP-0027 -NS_EVENT ='jabber:x:event' # JEP-0022 +NS_ENCRYPTED ='jabber:x:encrypted' # XEP-0027 +NS_EVENT ='jabber:x:event' # XEP-0022 NS_FEATURE ='http://jabber.org/protocol/feature-neg' -NS_FILE ='http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096 -NS_GEOLOC ='http://jabber.org/protocol/geoloc' # JEP-0080 +NS_FILE ='http://jabber.org/protocol/si/profile/file-transfer' # XEP-0096 +NS_GEOLOC ='http://jabber.org/protocol/geoloc' # XEP-0080 NS_GROUPCHAT ='gc-1.0' -NS_HTTP_AUTH ='http://jabber.org/protocol/http-auth' # JEP-0070 -NS_HTTP_BIND ='http://jabber.org/protocol/httpbind' # JEP-0124 +NS_HTTP_AUTH ='http://jabber.org/protocol/http-auth' # XEP-0070 +NS_HTTP_BIND ='http://jabber.org/protocol/httpbind' # XEP-0124 NS_IBB ='http://jabber.org/protocol/ibb' NS_INVISIBLE ='presence-invisible' # Jabberd2 NS_IQ ='iq' # Jabberd2 NS_LAST ='jabber:iq:last' NS_MESSAGE ='message' # Jabberd2 -NS_MOOD ='http://jabber.org/protocol/mood' # JEP-0107 +NS_MOOD ='http://jabber.org/protocol/mood' # XEP-0107 NS_MUC ='http://jabber.org/protocol/muc' NS_MUC_USER =NS_MUC+'#user' NS_MUC_ADMIN =NS_MUC+'#admin' NS_MUC_OWNER =NS_MUC+'#owner' -NS_NICK ='http://jabber.org/protocol/nick' # JEP-0172 -NS_OFFLINE ='http://www.jabber.org/jeps/jep-0030.html' # JEP-0013 -NS_PHYSLOC ='http://jabber.org/protocol/physloc' # JEP-0112 +NS_NICK ='http://jabber.org/protocol/nick' # XEP-0172 +NS_OFFLINE ='http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 +NS_PHYSLOC ='http://jabber.org/protocol/physloc' # XEP-0112 NS_PRESENCE ='presence' # Jabberd2 NS_PRIVACY ='jabber:iq:privacy' NS_PRIVATE ='jabber:iq:private' -NS_PROFILE ='http://jabber.org/protocol/profile' # JEP-0154 -NS_PUBSUB ='http://jabber.org/protocol/pubsub' # JEP-0060 +NS_PROFILE ='http://jabber.org/protocol/profile' # XEP-0154 +NS_PUBSUB ='http://jabber.org/protocol/pubsub' # XEP-0060 NS_REGISTER ='jabber:iq:register' NS_ROSTER ='jabber:iq:roster' -NS_ROSTERX ='http://jabber.org/protocol/rosterx' # JEP-0144 -NS_RPC ='jabber:iq:rpc' # JEP-0009 +NS_ROSTERX ='http://jabber.org/protocol/rosterx' # XEP-0144 +NS_RPC ='jabber:iq:rpc' # XEP-0009 NS_SASL ='urn:ietf:params:xml:ns:xmpp-sasl' NS_SEARCH ='jabber:iq:search' NS_SERVER ='jabber:server' NS_SESSION ='urn:ietf:params:xml:ns:xmpp-session' -NS_SI ='http://jabber.org/protocol/si' # JEP-0096 -NS_SI_PUB ='http://jabber.org/protocol/sipub' # JEP-0137 -NS_SIGNED ='jabber:x:signed' # JEP-0027 +NS_SI ='http://jabber.org/protocol/si' # XEP-0096 +NS_SI_PUB ='http://jabber.org/protocol/sipub' # XEP-0137 +NS_SIGNED ='jabber:x:signed' # XEP-0027 NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' NS_STREAM ='http://affinix.com/jabber/stream' NS_STREAMS ='http://etherx.jabber.org/streams' -NS_TIME ='jabber:iq:time' # JEP-0900 -NS_TIME_REVISED ='http://www.xmpp.org/extensions/xep-0202.html#ns' # JEP-0202 +NS_TIME ='jabber:iq:time' # XEP-0900 +NS_TIME_REVISED ='urn:xmpp:time' # XEP-0202 NS_TLS ='urn:ietf:params:xml:ns:xmpp-tls' NS_VACATION ='http://jabber.org/protocol/vacation' NS_VCARD ='vcard-temp' @@ -94,11 +94,11 @@ NS_VCARD_UPDATE =NS_VCARD+':x:update' NS_VERSION ='jabber:iq:version' NS_PING ='urn:xmpp:ping' # XEP-0199 -NS_WAITINGLIST ='http://jabber.org/protocol/waitinglist' # JEP-0130 -NS_XHTML_IM ='http://jabber.org/protocol/xhtml-im' # JEP-0071 +NS_WAITINGLIST ='http://jabber.org/protocol/waitinglist' # XEP-0130 +NS_XHTML_IM ='http://jabber.org/protocol/xhtml-im' # XEP-0071 NS_XHTML = 'http://www.w3.org/1999/xhtml' # " -NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout' # JEP-0141 -NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # JEP-0122 +NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout' # XEP-0141 +NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams' xmpp_stream_error_conditions=""" @@ -422,7 +422,7 @@ self.setTagData('body',val) def setXHTML(self,val,xmllang=None): - """ Sets the xhtml text of the message (JEP-0071). + """ Sets the xhtml text of the message (XEP-0071). The parameter is the "inner html" to the body.""" try: if xmllang: @@ -590,7 +590,7 @@ class DataField(Node): """ This class is used in the DataForm class to describe the single data item. - If you are working with jabber:x:data (JEP-0004, JEP-0068, JEP-0122) + If you are working with jabber:x:data (XEP-0004, XEP-0068, XEP-0122) then you will need to work with instances of this class. """ def __init__(self,name=None,value=None,typ=None,required=0,desc=None,options=[],node=None): """ Create new data field of specified name,value and type. @@ -667,7 +667,7 @@ class DataForm(Node): """ DataForm class. Used for manipulating dataforms in XMPP. - Relevant JEPs: 0004, 0068, 0122. + Relevant XEPs: 0004, 0068, 0122. Can be used in disco, pub-sub and many other applications.""" def __init__(self, typ=None, data=[], title=None, node=None): """

1 0

[commit-gajim] r8671 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:26:38 +0200 (Fri, 31 Aug 2007) New Revision: 8671 Modified: branches/gajim_0.11.1/src/adhoc_commands.py Log: [elghinn] ask confirmation when we close the ad hoc window in the middle of a command Modified: branches/gajim_0.11.1/src/adhoc_commands.py =================================================================== --- branches/gajim_0.11.1/src/adhoc_commands.py 2007-08-31 16:25:49 UTC (rev 8670) +++ branches/gajim_0.11.1/src/adhoc_commands.py 2007-08-31 16:26:38 UTC (rev 8671) @@ -53,6 +53,7 @@ # retrieving widgets from xml self.xml = gtkgui_helpers.get_glade('adhoc_commands_window.glade') self.window = self.xml.get_widget('adhoc_commands_window') + self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) for name in ('back_button', 'forward_button', 'execute_button','close_button','stages_notebook', 'retrieving_commands_stage_vbox', @@ -101,7 +102,7 @@ self.remove_pulsing() def on_adhoc_commands_window_delete_event(self, *anything): - return self.stage_adhoc_commands_window_delete_event(self, *anything) + return self.stage_adhoc_commands_window_delete_event(self.window) def __del__(self): print "Object has been deleted." @@ -252,6 +253,7 @@ else: self.window.destroy() return False + return True def stage3_back_button_clicked(self, widget): self.stage3_submit_form('prev')

1 0

[commit-gajim] r8670 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:25:49 +0200 (Fri, 31 Aug 2007) New Revision: 8670 Modified: branches/gajim_0.11.1/src/gajim.py Log: prevent TB when we click on a popup notification of an already handled event Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 09:08:17 UTC (rev 8669) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 16:25:49 UTC (rev 8670) @@ -1996,6 +1996,8 @@ if not event: # default to jid without resource event = gajim.events.get_first_event(account, jid, type_) + if not event: + return # Open the window self.roster.open_event(account, jid, event) else:

1 0

[commit-gajim] r8669 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 11:08:17 +0200 (Fri, 31 Aug 2007) New Revision: 8669 Modified: branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/common/connection_handlers.py branches/gajim_0.11.1/src/config.py branches/gajim_0.11.1/src/gajim.py Log: use new dataform widget in register agent window. Remove no more used old DataFormWindow. Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-31 08:59:52 UTC (rev 8668) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-31 09:08:17 UTC (rev 8669) @@ -222,7 +222,7 @@ return is_form = data[2] if is_form: - conf = self.parse_data_form(data[1]) + conf = data[1] else: conf = data[1].asDict() self.dispatch('REGISTER_AGENT_INFO', (data[0], conf, is_form)) Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 08:59:52 UTC (rev 8668) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 09:08:17 UTC (rev 8669) @@ -592,37 +592,15 @@ agent) self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo, {'agent': agent}) - - def build_data_from_dict(self, query, config): - x = query.setTag(common.xmpp.NS_DATA + ' x', attrs = {'type': 'submit'}) - i = 0 - while config.has_key(i): - if not config[i].has_key('type'): - i += 1 - continue - if config[i]['type'] == 'fixed': - i += 1 - continue - tag = x.addChild('field') - if config[i].has_key('var'): - tag.setAttr('var', config[i]['var']) - if config[i].has_key('values'): - for val in config[i]['values']: - if val == False: - val = '0' - elif val == True: - val = '1' - # Force to create a new child - tag.addChild('value').addData(val) - i += 1 - + def register_agent(self, agent, info, is_form = False): if not self.connection: return if is_form: iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent) query = iq.getTag('query') - self.build_data_from_dict(query, info) + info.setAttr('type', 'submit') + query.addChild(node = info) self.connection.send(iq) else: # fixed: blocking @@ -1795,67 +1773,9 @@ self.dispatch('NOTIFY', (jid_stripped, show, status, resource, prio, keyID, timestamp, contact_nickname)) # END presenceCB + def _StanzaArrivedCB(self, con, obj): self.last_io = gajim.idlequeue.current_time() - - - def parse_data_form(self, node): - dic = {} - tag = node.getTag('title') - if tag: - dic['title'] = tag.getData() - tag = node.getTag('instructions') - if tag: - dic['instructions'] = tag.getData() - i = 0 - for child in node.getChildren(): - if child.getName() != 'field': - continue - var = child.getAttr('var') - ctype = child.getAttr('type') - label = child.getAttr('label') - if not var and ctype != 'fixed': # We must have var if type != fixed - continue - dic[i] = {} - if var: - dic[i]['var'] = var - if ctype: - dic[i]['type'] = ctype - if label: - dic[i]['label'] = label - tags = child.getTags('value') - if len(tags): - dic[i]['values'] = [] - for tag in tags: - data = tag.getData() - if ctype == 'boolean': - if data in ('yes', 'true', 'assent', '1'): - data = True - else: - data = False - dic[i]['values'].append(data) - tag = child.getTag('desc') - if tag: - dic[i]['desc'] = tag.getData() - option_tags = child.getTags('option') - if len(option_tags): - dic[i]['options'] = {} - j = 0 - for option_tag in option_tags: - dic[i]['options'][j] = {} - label = option_tag.getAttr('label') - tags = option_tag.getTags('value') - dic[i]['options'][j]['values'] = [] - for tag in tags: - dic[i]['options'][j]['values'].append(tag.getData()) - if not label: - label = dic[i]['options'][j]['values'][0] - dic[i]['options'][j]['label'] = label - j += 1 - if not dic[i].has_key('values'): - dic[i]['values'] = [dic[i]['options'][0]['values'][0]] - i += 1 - return dic def _MucOwnerCB(self, con, iq_obj): gajim.log.debug('MucOwnerCB') Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-08-31 08:59:52 UTC (rev 8668) +++ branches/gajim_0.11.1/src/config.py 2007-08-31 09:08:17 UTC (rev 8669) @@ -2125,11 +2125,14 @@ class ServiceRegistrationWindow: '''Class for Service registration window: Window that appears when we want to subscribe to a service - if is_form we use DataFormWindow else we use service_registarion_window''' + if is_form we use dataforms_widget else we use service_registarion_window''' def __init__(self, service, infos, account, is_form): self.service = service self.account = account self.is_form = is_form + self.xml = gtkgui_helpers.get_glade('service_registration_window.glade') + self.window = self.xml.get_widget('service_registration_window') + self.window.set_transient_for(gajim.interface.roster.window) if self.is_form: dataform = dataforms.ExtendForm(node = infos) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) @@ -2145,20 +2148,19 @@ self.data_form_widget = FakeDataForm(infos) table = self.xml.get_widget('table') table.attach(self.data_form_widget, 0, 2, 0, 1) - self.xml.signal_autoconnect(self) - self.window.show_all() + self.xml.signal_autoconnect(self) + self.window.show_all() + def on_cancel_button_clicked(self, widget): self.window.destroy() def on_ok_button_clicked(self, widget): # send registration info to the core if self.is_form: - # We pressed OK button of the DataFormWindow - if self.infos.has_key('registered'): - del self.infos['registered'] + form = self.data_form_widget.data_form gajim.connections[self.account].register_agent(self.service, - self.infos, True) # True is for is_form + form, True) # True is for is_form else: infos = self.data_form_widget.get_infos() if infos.has_key('instructions'): @@ -2340,7 +2342,6 @@ del gajim.interface.instances[self.account]['gc_config'][self.room_jid] def on_ok_button_clicked(self, widget): - # We pressed OK button of the DataFormWindow if self.form: form = self.data_form_widget.data_form gajim.connections[self.account].send_gc_config(self.room_jid, form) Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 08:59:52 UTC (rev 8668) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 09:08:17 UTC (rev 8669) @@ -868,8 +868,9 @@ self.roster.remove_contact(c, account) def handle_event_register_agent_info(self, account, array): - #('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) - if array[1].has_key('instructions'): + # ('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) + # info in a dataform if is_form is True + if array[2] or array[1].has_key('instructions'): config.ServiceRegistrationWindow(array[0], array[1], account, array[2]) else:

1 0

[commit-gajim] r8668 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:59:52 +0200 (Fri, 31 Aug 2007) New Revision: 8668 Modified: branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/common/connection_handlers.py branches/gajim_0.11.1/src/config.py branches/gajim_0.11.1/src/gajim.py Log: use new dataform widget in groupchat config window Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-31 08:48:04 UTC (rev 8667) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-31 08:59:52 UTC (rev 8668) @@ -1148,11 +1148,12 @@ item.setAttr('affiliation', affiliation) self.connection.send(iq) - def send_gc_config(self, room_jid, config): + def send_gc_config(self, room_jid, form): iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ common.xmpp.NS_MUC_OWNER) query = iq.getTag('query') - self.build_data_from_dict(query, config) + form.setAttr('type', 'submit') + query.addChild(node = form) self.connection.send(iq) def gpg_passphrase(self, passphrase): Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 08:48:04 UTC (rev 8667) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 08:59:52 UTC (rev 8668) @@ -1866,8 +1866,7 @@ node = q if not node: return - dic = self.parse_data_form(node) - self.dispatch('GC_CONFIG', (helpers.get_full_jid_from_iq(iq_obj), dic)) + self.dispatch('GC_CONFIG', (helpers.get_full_jid_from_iq(iq_obj), node)) def _MucAdminCB(self, con, iq_obj): gajim.log.debug('MucAdminCB') Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-08-31 08:48:04 UTC (rev 8667) +++ branches/gajim_0.11.1/src/config.py 2007-08-31 08:59:52 UTC (rev 8668) @@ -28,6 +28,7 @@ import cell_renderer_image import message_control import chat_control +import dataforms_widget try: import gtkspell @@ -41,6 +42,7 @@ from common import passwords from common import zeroconf from common import dbus_support +from common import dataforms from common.exceptions import GajimGeneralException @@ -2167,11 +2169,12 @@ self.window.destroy() -class GroupchatConfigWindow(DataFormWindow): +class GroupchatConfigWindow: '''GroupchatConfigWindow class''' - def __init__(self, account, room_jid, config = None): - DataFormWindow.__init__(self, account, config) + def __init__(self, account, room_jid, form = None): + self.account = account self.room_jid = room_jid + self.form = form self.remove_button = {} self.affiliation_treeview = {} self.list_init = {} # list at the beginning @@ -2180,9 +2183,25 @@ 'owner': _('Owner List'), 'admin':_('Administrator List')} - # Draw the edit affiliation list things + self.xml = gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_window') + self.window = self.xml.get_widget('data_form_window') + self.window.set_transient_for(gajim.interface.roster.window) + + if self.form: + config_vbox = self.xml.get_widget('config_vbox') + dataform = dataforms.ExtendForm(node = self.form) + self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + # hide scrollbar of this data_form_widget, we already have in this + # widget + sw = self.data_form_widget.xml.get_widget('single_form_scrolledwindow') + sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER) + + self.data_form_widget.show() + config_vbox.pack_start(self.data_form_widget) + + # Draw the edit affiliation list things add_on_vbox = self.xml.get_widget('add_on_vbox') - + for affiliation in ('outcast', 'member', 'owner', 'admin'): self.list_init[affiliation] = {} hbox = gtk.HBox(spacing = 5) @@ -2239,8 +2258,12 @@ gajim.connections[self.account].get_affiliation_list(self.room_jid, affiliation) - add_on_vbox.show_all() + self.xml.signal_autoconnect(self) + self.window.show_all() + def on_cancel_button_clicked(self, widget): + self.window.destroy() + def on_cell_edited(self, cell, path, new_text): model = self.affiliation_treeview['outcast'].get_model() new_text = new_text.decode('utf-8') @@ -2318,9 +2341,9 @@ def on_ok_button_clicked(self, widget): # We pressed OK button of the DataFormWindow - if self.config: - gajim.connections[self.account].send_gc_config(self.room_jid, - self.config) + if self.form: + form = self.data_form_widget.data_form + gajim.connections[self.account].send_gc_config(self.room_jid, form) for affiliation in ('outcast', 'member', 'owner', 'admin'): list = {} actual_jid_list = [] Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 08:48:04 UTC (rev 8667) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 08:59:52 UTC (rev 8668) @@ -1076,7 +1076,7 @@ gc_control.print_conversation(text) def handle_event_gc_config(self, account, array): - #('GC_CONFIG', account, (jid, config)) config is a dict + #('GC_CONFIG', account, (jid, form)) config is a dict room_jid = array[0].split('/')[0] if room_jid in gajim.automatic_rooms[account]: # use default configuration

1 0

[commit-gajim] r8667 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:48:04 +0200 (Fri, 31 Aug 2007) New Revision: 8667 Modified: branches/gajim_0.11.1/src/roster_window.py Log: join bookmarks when we come back from invisibility. fixes #3203 Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:45:09 UTC (rev 8666) +++ branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:48:04 UTC (rev 8667) @@ -2812,8 +2812,37 @@ gajim.sleeper_state[account] = 'online' elif gajim.sleeper_state[account] not in ('autoaway', 'autoxa'): gajim.sleeper_state[account] = 'off' - gajim.connections[account].change_status(status, txt, auto) + if to: + gajim.connections[account].send_custom_status(status, txt, to) + else: + was_invisible = gajim.connections[account].connected == \ + gajim.SHOW_LIST.index('invisible') + gajim.connections[account].change_status(status, txt, auto) + if not gajim.interface.minimized_controls.has_key(account): + gajim.interface.minimized_controls[account] = {} + for gc_control in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + if gc_control.account == account: + if gajim.gc_connected[account][gc_control.room_jid]: + gajim.connections[account].send_gc_status(gc_control.nick, + gc_control.room_jid, status, txt) + else: + # for some reason, we are not connected to the room even if + # tab is opened, send initial join_gc() + gajim.connections[account].join_gc(gc_control.nick, + gc_control.room_jid, None) + if was_invisible: + # We come back from invisible, join bookmarks + for bm in gajim.connections[account].bookmarks: + room_jid = bm['jid'] + if room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][room_jid]: + continue + self.join_gc_room(account, room_jid, bm['nick'], bm['password'], + minimize = gajim.config.get('minimize_autojoined_rooms')) + def get_status_message(self, show): if show in gajim.config.get_per('defaultstatusmsg'): if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):

1 0

[commit-gajim] r8666 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:45:09 +0200 (Fri, 31 Aug 2007) New Revision: 8666 Modified: branches/gajim_0.11.1/src/common/dataforms.py Log: Dataforms: 'fixed' fields can have multiple lines of text spanning over several <value/> elements. Modified: branches/gajim_0.11.1/src/common/dataforms.py =================================================================== --- branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 08:43:27 UTC (rev 8665) +++ branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 08:45:09 UTC (rev 8666) @@ -34,7 +34,7 @@ ''' Helper function to create a field of given type. ''' f = { 'boolean': BooleanField, - 'fixed': StringField, + 'fixed': TextMultiField, # not editable, still can have multiple lines of text 'hidden': StringField, 'text-private': StringField, 'text-single': StringField, @@ -54,7 +54,7 @@ typ=node.getAttr('type') f = { 'boolean': BooleanField, - 'fixed': StringField, + 'fixed': TextMultiField, 'hidden': StringField, 'text-private': StringField, 'text-single': StringField, @@ -197,7 +197,6 @@ pass return locals() - class ListField(DataField): ''' Covers fields of types: jid-multi, jid-single, list-multi, list-single. ''' @nested_property

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 August 2007