From: Ed Page <eopage@byu.net>
Date: Sun, 3 Jan 2010 05:06:52 +0000 (-0600)
Subject: 0.1.0-7: Trying account-plugin-haze's UI configuration, it looks like its completely... 
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=7e6e09bb4b2ee36c46874cfe50f741ca0db0cfd1;hp=206d148ad8b0a2e3ea6d569c2dcb486497dc11c9

0.1.0-7: Trying account-plugin-haze's UI configuration, it looks like its completely automated, sweet
---

diff --git a/src/connection.py b/src/connection.py
index f359cd5..5f5ad3d 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -30,7 +30,7 @@ class TheOneRingConnection(
 	# Overriding a base class variable
 	# Should the forwarding number be handled by the alias or by an option?
 	_mandatory_parameters = {
-		'username' : 's',
+		'account' : 's',
 		'password' : 's',
 		'forward' : 's',
 	}
@@ -43,7 +43,7 @@ class TheOneRingConnection(
 	def __init__(self, manager, parameters):
 		self.check_parameters(parameters)
 		try:
-			account = unicode(parameters['username'])
+			account = unicode(parameters['account'])
 
 			# Connection init must come first
 			telepathy.server.Connection.__init__(
@@ -59,7 +59,7 @@ class TheOneRingConnection(
 
 			self._manager = weakref.proxy(manager)
 			self._credentials = (
-				parameters['username'].encode('utf-8'),
+				parameters['account'].encode('utf-8'),
 				parameters['password'].encode('utf-8'),
 			)
 			self._callbackNumber = parameters['forward'].encode('utf-8')
diff --git a/src/constants.py b/src/constants.py
index 4b323a4..cd22fc6 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Telepathy-TheOneRing"
 __app_name__ = "telepathy-theonering"
 __version__ = "0.1.0"
-__build__ = 6
+__build__ = 7
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering")
 _user_settings_ = "%s/settings.ini" % _data_path_
diff --git a/support/builddeb.py b/support/builddeb.py
index 589e9b3..4182869 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -88,6 +88,13 @@ def build_package(distribution):
 		"fremantle": "user/network",
 		"mer": "user/network",
 	}[distribution]
+	p.depends += {
+		"debian": "",
+		"chinook": "",
+		"diablo": "account-plugin-haze",
+		"fremantle": "account-plugin-haze",
+		"mer": "",
+	}[distribution]
 	p.arch = "all"
 	p.urgency = "low"
 	p.distribution = "diablo fremantle mer debian"
diff --git a/support/theonering.manager b/support/theonering.manager
index dab8505..fdf9f03 100644
--- a/support/theonering.manager
+++ b/support/theonering.manager
@@ -4,6 +4,6 @@ BusName = org.freedesktop.Telepathy.ConnectionManager.theonering
 ObjectPath = /org/freedesktop/Telepathy/ConnectionManager/theonering
 
 [Protocol sip]
-param-username = s required
+param-account = s required
 param-password = s required secret
 param-forward = s required
diff --git a/support/theonering.profile.fremantle b/support/theonering.profile.fremantle
index f591508..a24cfb1 100644
--- a/support/theonering.profile.fremantle
+++ b/support/theonering.profile.fremantle
@@ -3,6 +3,7 @@ Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
 IconName = theonering
+ConfigurationUI = haze-plugin
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias
 VCardDefault = 1