diff options
| author | Ted Gould <ted@canonical.com> | 2009-10-06 15:21:12 -0400 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-10-06 15:21:12 -0400 |
| commit | 80ba9c622f3f3d5f31c5adcbce19ef15d54e2270 (patch) | |
| tree | 8151a0fdf3fe24c03f1c5c840958fe2eac484730 | |
| parent | fa6bb41e58f3a7a42a49b301fc697651063c0278 (diff) | |
| parent | 74996e1b74e945ff90f9dfad68375e0b6f3a84d9 (diff) | |
| download | ayatana-indicator-session-80ba9c622f3f3d5f31c5adcbce19ef15d54e2270.tar.gz ayatana-indicator-session-80ba9c622f3f3d5f31c5adcbce19ef15d54e2270.tar.bz2 ayatana-indicator-session-80ba9c622f3f3d5f31c5adcbce19ef15d54e2270.zip | |
Making it so that the Empathy account manager doesn't start
unless you set the status.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/status-provider-mc5.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 66bd6c8..7602e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-session (0.1.6-0ubuntu1~ppa4) UNRELEASED; urgency=low + + * Making it so that the Empathy account manager doesn't start + unless you set the status. + + -- Ted Gould <ted@ubuntu.com> Tue, 06 Oct 2009 15:20:43 -0400 + indicator-session (0.1.6-0ubuntu1~ppa3) karmic; urgency=low * Default icon too! diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 813ce3e..671e459 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -113,8 +113,8 @@ status_provider_mc5_init (StatusProviderMC5 *self) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); - priv->status = STATUS_PROVIDER_STATUS_OFFLINE; - priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); + priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->manager = NULL; g_signal_connect(G_OBJECT(priv->manager), "global-presence-changed", G_CALLBACK(presence_changed), self); @@ -169,8 +169,7 @@ set_status (StatusProvider * sp, StatusProviderStatus status) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp); if (priv->manager == NULL) { - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; - return; + priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); } empathy_account_manager_request_global_presence(priv->manager, sp_to_tp_map[status], sp_to_mc_map[status], ""); |