Changeset 8669 for branches/gajim_0.11.1/src/common

Timestamp:

08/31/07 11:08:17 (15 months ago)

Author:

asterix

Message:

use new dataform widget in register agent window. Remove no more used old DataFormWindow?.

Location:

branches/gajim_0.11.1/src/common

Files:

• connection_handlers.py (modified) (3 diffs)
• connection.py (modified) (1 diff)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -593 +593 @@
                 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:
@@ -623 +600 @@
                         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:
@@ -1796 +1774 @@
                                 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):

branches/gajim_0.11.1/src/common/connection.py

@@ -223 +223 @@
                                 is_form = data[2]
                                 if is_form:
-                                        conf = self.parse_data_form(data[1])
+                                        conf = data[1]
                                 else:
                                         conf = data[1].asDict()