david/jmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Configurable JMC name

Browse Source 
darcs-hash:20060206201158-86b55-32a482b703d87c45c3c4c29b76068fe3d174bd4d.gz
This commit is contained in:
David Rousselie
2006-02-06 21:11:58 +01:00
parent 81b79d0e36
commit 1b4dd51f79
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jabber/component.py
View File

@@ -59,7 +59,8 @@ class MailComponent(Component):
default_lang, default_lang,
check_interval, check_interval,
spool_dir, spool_dir,
storage): storage,
name):
Component.__init__(self, \ Component.__init__(self, \
JID(jid), \ JID(jid), \
secret, \ secret, \
@@ -70,6 +71,7 @@ class MailComponent(Component):
self.__logger = logging.getLogger("jabber.Component") self.__logger = logging.getLogger("jabber.Component")
self.__shutdown = 0 self.__shutdown = 0
self.__lang = Lang(default_lang) self.__lang = Lang(default_lang)
self.__name = name
signal.signal(signal.SIGINT, self.signal_handler) signal.signal(signal.SIGINT, self.signal_handler)
signal.signal(signal.SIGTERM, self.signal_handler) signal.signal(signal.SIGTERM, self.signal_handler)
@@ -473,7 +475,7 @@ class MailComponent(Component):
if node is None: if node is None:
di.add_feature("jabber:iq:version") di.add_feature("jabber:iq:version")
di.add_feature("jabber:iq:register") di.add_feature("jabber:iq:register")
DiscoIdentity(di, "Jabber Mail Component", "headline", "mail") DiscoIdentity(di, self.__name, "headline", "newmail")
else: else:
di.add_feature("jabber:iq:register") di.add_feature("jabber:iq:register")
return di return di
@@ -499,7 +501,7 @@ class MailComponent(Component):
self.__logger.debug("GET_VERSION") self.__logger.debug("GET_VERSION")
iq = iq.make_result_response() iq = iq.make_result_response()
q = iq.new_query("jabber:iq:version") q = iq.new_query("jabber:iq:version")
q.newTextChild(q.ns(), "name", "Jabber Mail Component") q.newTextChild(q.ns(), "name", self.__name)
q.newTextChild(q.ns(), "version", "0.2") q.newTextChild(q.ns(), "version", "0.2")
self.stream.send(iq) self.stream.send(iq)
return 1 return 1

3
jmc.py
View File

@@ -59,7 +59,8 @@ def main(config_file = "jmc.xml", isDebug = 0):
config.get_content("config/jabber/language"), \ config.get_content("config/jabber/language"), \
int(config.get_content("config/check_interval")), \ int(config.get_content("config/check_interval")), \
config.get_content("config/spooldir"), \ config.get_content("config/spooldir"), \
config.get_content("config/storage")) config.get_content("config/storage"), \
config.get_content("config/jabber/vCard/FN"))
print "starting..." print "starting..."
mailcomp.run(1) mailcomp.run(1)