The Me Menu

Merge lp:~ken-vandine/indicator-me/mc5-naming-fix into lp:indicator-me

  1. mc5-naming-fix
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ken-vandine/indicator-me/mc5-naming-fix
Merge into: lp:indicator-me
Diff against target: 21 lines (+2/-2)
1 file modified
src/status-provider-mc5.c (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/indicator-me/mc5-naming-fix
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+17233@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

dbus fix for mc5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/status-provider-mc5.c'
2--- src/status-provider-mc5.c 2009-12-08 16:13:30 +0000
3+++ src/status-provider-mc5.c 2010-01-12 15:55:20 +0000
4@@ -72,7 +72,7 @@
5
6 #define STATUS_PROVIDER_MC5_GET_PRIVATE(o) \
7 (G_TYPE_INSTANCE_GET_PRIVATE ((o), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Private))
8-#define MC5_WELL_KNOWN_NAME "org.freedesktop.Telepathy.MissionControl5"
9+#define MC5_WELL_KNOWN_NAME "org.freedesktop.Telepathy.AccountManager"
10
11 /* Prototypes */
12 /* GObject stuff */
13@@ -134,7 +134,7 @@
14 priv->manager = TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
15 "dbus-daemon", daemon,
16 "dbus-connection", ((TpProxy *) daemon)->dbus_connection,
17- "bus-name", "org.freedesktop.Telepathy.MissionControl5",
18+ "bus-name", "org.freedesktop.Telepathy.AccountManager",
19 "object-path", "/org/freedesktop/Telepathy/AccountManager",
20 NULL));
21 g_signal_connect(G_OBJECT(priv->manager), "most-available-presence-changed", G_CALLBACK(presence_changed), self);

Subscribers

People subscribed via source and target branches