# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1295360578 -3600
# Node ID 0ecd9c33fa3aa3214aa37b7291583ad14f349e34
# Parent  c8406fe5e81ee45e3394c26cc6aa718cb48fd5c1
IMAP & SMTP Port parameters are now merged in "Mail Server" category

diff -r c8406fe5e81e -r 0ecd9c33fa3a src/plugins/plugin_misc_imap.py
--- a/src/plugins/plugin_misc_imap.py	Tue Jan 18 03:59:59 2011 +0100
+++ b/src/plugins/plugin_misc_imap.py	Tue Jan 18 15:22:58 2011 +0100
@@ -54,8 +54,8 @@
     params = """
     <params>
     <general>
-    <category name="IMAP Server">
-        <param name="Port" value="10143" type="string" />
+    <category name="Mail Server">
+        <param name="IMAP Port" value="10143" type="string" />
     </category>
     </general>
     </params>
@@ -68,7 +68,7 @@
         #parameters
         host.memory.importParams(self.params)
 
-        port = int(self.host.memory.getParamA("Port", "IMAP Server"))
+        port = int(self.host.memory.getParamA("IMAP Port", "Mail Server"))
         info(_("Launching IMAP server on port %d"), port)
         
         self.server_factory = ImapServerFactory(self.host)
diff -r c8406fe5e81e -r 0ecd9c33fa3a src/plugins/plugin_misc_smtp.py
--- a/src/plugins/plugin_misc_smtp.py	Tue Jan 18 03:59:59 2011 +0100
+++ b/src/plugins/plugin_misc_smtp.py	Tue Jan 18 15:22:58 2011 +0100
@@ -53,8 +53,8 @@
     params = """
     <params>
     <general>
-    <category name="SMTP Server">
-        <param name="Port" value="10125" type="string" />
+    <category name="Mail Server">
+        <param name="SMTP Port" value="10125" type="string" />
     </category>
     </general>
     </params>
@@ -67,7 +67,7 @@
         #parameters
         host.memory.importParams(self.params)
 
-        port = int(self.host.memory.getParamA("Port", "SMTP Server"))
+        port = int(self.host.memory.getParamA("SMTP Port", "Mail Server"))
         info(_("Launching SMTP server on port %d"), port)
         
         self.server_factory = SmtpServerFactory(self.host)