X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Futil%2Ftp_utils.py;h=1c6cbc898a60548913e6afa6af4488ca971bf2c1;hb=835f22ccd4b8e357bcbbc364d451e98721401e72;hp=ae9250a1c74e8108b3388e1643c68fefdaa8fa5e;hpb=69291b6ea410825bc288f4071e4a2bd200bdac2e;p=theonering

diff --git a/src/util/tp_utils.py b/src/util/tp_utils.py
index ae9250a..1c6cbc8 100644
--- a/src/util/tp_utils.py
+++ b/src/util/tp_utils.py
@@ -9,7 +9,7 @@ import util.go_utils as gobject_utils
 import misc
 
 
-_moduleLogger = logging.getLogger("tp_utils")
+_moduleLogger = logging.getLogger(__name__)
 DBUS_PROPERTIES = 'org.freedesktop.DBus.Properties'
 
 
@@ -128,30 +128,93 @@ class NewChannelSignaller(object):
 	):
 		connObjectPath = channel_path_to_conn_path(channelObjectPath)
 		serviceName = path_to_service_name(channelObjectPath)
-		self._on_user_new_channel(
-			self._sessionBus, serviceName, connObjectPath, channelObjectPath, channelType
+		try:
+			self._on_user_new_channel(
+				self._sessionBus, serviceName, connObjectPath, channelObjectPath, channelType
+			)
+		except Exception:
+			_moduleLogger.exception("Blocking exception from being passed up")
+
+
+class EnableSystemContactIntegration(object):
+
+	ACCOUNT_MGR_NAME = "org.freedesktop.Telepathy.AccountManager"
+	ACCOUNT_MGR_PATH = "/org/freedesktop/Telepathy/AccountManager"
+	ACCOUNT_MGR_IFACE_QUERY = "com.nokia.AccountManager.Interface.Query"
+	ACCOUNT_IFACE_COMPAT = "com.nokia.Account.Interface.Compat"
+	ACCOUNT_IFACE_COMPAT_PROFILE = "com.nokia.Account.Interface.Compat.Profile"
+	DBUS_PROPERTIES = 'org.freedesktop.DBus.Properties'
+
+	def __init__(self, profileName):
+		self._bus = dbus.SessionBus()
+		self._profileName = profileName
+
+	def start(self):
+		self._accountManager = self._bus.get_object(
+			self.ACCOUNT_MGR_NAME,
+			self.ACCOUNT_MGR_PATH,
+		)
+		self._accountManagerQuery = dbus.Interface(
+			self._accountManager,
+			dbus_interface=self.ACCOUNT_MGR_IFACE_QUERY,
+		)
+
+		self._accountManagerQuery.FindAccounts(
+			{
+				self.ACCOUNT_IFACE_COMPAT_PROFILE: self._profileName,
+			},
+			reply_handler = self._on_found_accounts_reply,
+			error_handler = self._on_error,
 		)
 
+	@misc.log_exception(_moduleLogger)
+	def _on_found_accounts_reply(self, accountObjectPaths):
+		for accountObjectPath in accountObjectPaths:
+			print accountObjectPath
+			account = self._bus.get_object(
+				self.ACCOUNT_MGR_NAME,
+				accountObjectPath,
+			)
+			accountProperties = dbus.Interface(
+				account,
+				self.DBUS_PROPERTIES,
+			)
+			accountProperties.Set(
+				self.ACCOUNT_IFACE_COMPAT,
+				"SecondaryVCardFields",
+				["TEL"],
+				reply_handler = self._on_field_set,
+				error_handler = self._on_error,
+			)
+
+	@misc.log_exception(_moduleLogger)
+	def _on_field_set(self):
+		_moduleLogger.info("SecondaryVCardFields Set")
+
+	@misc.log_exception(_moduleLogger)
+	def _on_error(self, error):
+		_moduleLogger.error("%r" % (error, ))
+
 
 def channel_path_to_conn_path(channelObjectPath):
 	"""
-	>>> channel_path_to_conn_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1")
-	'/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME'
+	>>> channel_path_to_conn_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1")
+	'/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME'
 	"""
 	return channelObjectPath.rsplit("/", 1)[0]
 
 
 def path_to_service_name(path):
 	"""
-	>>> path_to_service_name("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1")
-	'org.freedesktop.Telepathy.ConnectionManager.theonering.sip.USERNAME'
+	>>> path_to_service_name("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1")
+	'org.freedesktop.Telepathy.ConnectionManager.theonering.gv.USERNAME'
 	"""
 	return ".".join(path[1:].split("/")[0:7])
 
 
 def cm_from_path(path):
 	"""
-	>>> cm_from_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1")
+	>>> cm_from_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1")
 	'theonering'
 	"""
 	return path[1:].split("/")[4]