ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ken VanDine (ken-vandine)
Related merge proposals:
  https://code.launchpad.net/~ken-vandine/indicator-me/tp_am_cleanup/+merge/51944
  proposed by: Ken VanDine (ken-vandine)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 133 [merge]
committer: Ken VanDine <ken.vandine@xxxxxxxxxxxxx>
branch nick: indicator-me
timestamp: Wed 2011-03-02 14:50:11 -0500
message:
  Merged in TpAccountManager cleanup
modified:
  src/status-provider-mc5.c


--
lp:indicator-me
https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-me.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk/+edit-subscription

=== modified file 'src/status-provider-mc5.c'
--- src/status-provider-mc5.c	2010-01-12 15:52:56 +0000
+++ src/status-provider-mc5.c	2011-03-02 19:30:52 +0000
@@ -115,28 +115,12 @@
 build_eam (StatusProviderMC5 * self)
 {
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
-	static TpDBusDaemon *daemon = NULL;
-	GError *error = NULL;
 
 	if (priv->manager != NULL) {
 		return;
 	}
-	/* the daemon is used to communicate via DBus */
-	daemon = tp_dbus_daemon_dup(&error);
-
-	if (daemon == NULL)
-	{
-		g_debug("Cannot create DBus daemon: %s\n", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	priv->manager = TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
-		"dbus-daemon", daemon,
-		"dbus-connection", ((TpProxy *) daemon)->dbus_connection,
-		"bus-name", "org.freedesktop.Telepathy.AccountManager",
-		"object-path", "/org/freedesktop/Telepathy/AccountManager",
-		NULL));
+
+	priv->manager = tp_account_manager_dup();
 	g_signal_connect(G_OBJECT(priv->manager), "most-available-presence-changed", G_CALLBACK(presence_changed), self);
 
 	return;