Changeset 162 for trunk/jjigw

Show
Ignore:
Timestamp:
06/13/05 21:59:14 (4 years ago)
Author:
jajcus
Message:

- Jabber Registrar registered categories/types, 'conference/irc' first. Needed for compatibility with some clients.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jjigw/component.py

    r161 r162  
    4040        pyxmpp.jabberd.component.Component.__init__(self,config.jid, 
    4141                config.connect.secret,config.connect.host,config.connect.port, 
    42                 disco_category="gateway",disco_type="irc") 
     42                disco_name="JJIGW IRC gateway", disco_category="conference",disco_type="irc") 
    4343        self.__logger=logging.getLogger("jjigw.Component") 
    4444        self.profile=profile 
    …… 
    5454        else: 
    5555            self.ident_handler=None 
     56        self.disco_info.add_identity("JJIGW IRC gateway", "conference", "text") # MUC compliance 
     57        self.disco_info.add_identity("JJIGW IRC gateway", "gateway", "x-irc") # non-conference gateway services 
    5658 
    5759    def get_session(self,user_jid,component_jid): 
    …… 
    367369                else: 
    368370                    name="IRC gateway" 
    369                 DiscoIdentity(di,name,"gateway","irc") 
     371                DiscoIdentity(di,name,"conference","irc") 
     372                DiscoIdentity(di,name,"conference","text") 
     373                DiscoIdentity(di,name,"gateway","x-irc") 
    370374            return di 
    371375        elif len(to.node)>1 and to.node[0] in u"&#+!" and to.resource is None: 
    …… 
    376380            else: 
    377381                name="%s IRC channel" % (to.node,) 
    378             DiscoIdentity(di,name ,"conference","text") 
     382            DiscoIdentity(di, name, "conference", "text") 
     383            DiscoIdentity(di, name, "conference", "irc") 
    379384            return di 
    380385        return iq.make_error_response("feature-not-implemented")