From e340453399d61b19111cb56233673cd74223552c Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Tue, 19 Jan 2010 20:11:07 -0600
Subject: [PATCH] Updating to latest butterfly fad, should eventually do
 capabilities too

---
 src/connection.py         |    8 +++++---
 src/connection_manager.py |   28 +++++++++-------------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/connection.py b/src/connection.py
index eafaacf..36624b3 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -51,19 +51,21 @@ class TheOneRingConnection(
 	capabilities.CapabilitiesMixin,
 ):
 
-	# Overriding a base class variable
-	# Should the forwarding number be handled by the alias or by an option?
+	# overiding base class variable
 	_mandatory_parameters = {
 		'account' : 's',
 		'password' : 's',
 	}
-	# Overriding a base class variable
+	# overiding base class variable
 	_optional_parameters = {
 		'forward' : 's',
 	}
 	_parameter_defaults = {
 		'forward' : '',
 	}
+	_secret_parameters = set((
+		"password",
+	))
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def __init__(self, manager, parameters):
diff --git a/src/connection_manager.py b/src/connection_manager.py
index 207f773..0f75671 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -45,34 +45,24 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
 		mandatoryParameters = ConnectionClass._mandatory_parameters
 		optionalParameters = ConnectionClass._optional_parameters
 		defaultParameters = ConnectionClass._parameter_defaults
+		secretParameters = ConnectionClass._secret_parameters
 
 		for parameterName, parameterType in mandatoryParameters.iteritems():
 			flags = telepathy.CONN_MGR_PARAM_FLAG_REQUIRED
-			if parameterName == "password":
+			if parameterName in secretParameters:
 				flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
-			param = (
-				parameterName,
-				flags,
-				parameterType,
-				'',
-			)
+			param = (parameterName, flags, parameterType, "")
 			result.append(param)
 
 		for parameterName, parameterType in optionalParameters.iteritems():
+			flags = 0
+			default = ""
+			if parameterName in secretParameters:
+				flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
 			if parameterName in defaultParameters:
-				flags = telepathy.CONN_MGR_PARAM_FLAG_HAS_DEFAULT
-				if parameterName == "password":
-					flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
+				flags |= telepathy.CONN_MGR_PARAM_FLAG_HAS_DEFAULT
 				default = defaultParameters[parameterName]
-			else:
-				flags = 0
-				default = ""
-			param = (
-				parameterName,
-				flags,
-				parameterName,
-				default,
-			)
+			param = (parameterName, flags, parameterType, default)
 			result.append(param)
 
 		return result
-- 
1.7.9.5