From 1b4dd51f79ec17d0b1cfca0215c5eb0c9e5ab868 Mon Sep 17 00:00:00 2001
From: David Rousselie <dax@happycoders.org>
Date: Mon, 6 Feb 2006 21:11:58 +0100
Subject: [PATCH] Configurable JMC name

darcs-hash:20060206201158-86b55-32a482b703d87c45c3c4c29b76068fe3d174bd4d.gz
---
 jabber/component.py | 8 +++++---
 jmc.py              | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jabber/component.py b/jabber/component.py
index 7b898bd..85e7b03 100644
--- a/jabber/component.py
+++ b/jabber/component.py
@@ -59,7 +59,8 @@ class MailComponent(Component):
                  default_lang,
                  check_interval,
                  spool_dir,
-                 storage):
+                 storage,
+                 name):
 	Component.__init__(self, \
                            JID(jid), \
                            secret, \
@@ -70,6 +71,7 @@ class MailComponent(Component):
  	self.__logger = logging.getLogger("jabber.Component")
 	self.__shutdown = 0
         self.__lang = Lang(default_lang)
+        self.__name = name
         
 	signal.signal(signal.SIGINT, self.signal_handler)
         signal.signal(signal.SIGTERM, self.signal_handler)
@@ -473,7 +475,7 @@ class MailComponent(Component):
 	if node is None:
 	    di.add_feature("jabber:iq:version")
 	    di.add_feature("jabber:iq:register")
-	    DiscoIdentity(di, "Jabber Mail Component", "headline", "mail")
+	    DiscoIdentity(di, self.__name, "headline", "newmail")
 	else:
 	    di.add_feature("jabber:iq:register")
 	return di
@@ -499,7 +501,7 @@ class MailComponent(Component):
 	self.__logger.debug("GET_VERSION")
         iq = iq.make_result_response()
         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")
         self.stream.send(iq)
         return 1
diff --git a/jmc.py b/jmc.py
index 575470c..3b2bb5d 100755
--- a/jmc.py
+++ b/jmc.py
@@ -59,7 +59,8 @@ def main(config_file = "jmc.xml", isDebug = 0):
                                  config.get_content("config/jabber/language"), \
                                  int(config.get_content("config/check_interval")), \
                                  config.get_content("config/spooldir"), \
-                                 config.get_content("config/storage"))
+                                 config.get_content("config/storage"), \
+                                 config.get_content("config/jabber/vCard/FN"))
 
         print "starting..."
         mailcomp.run(1)