Merge lp:~ted/indicator-messages/telepathy-offline into lp:indicator-messages/0.3

Proposed by Ted Gould on 2012-04-06
Status: Merged
Approved by: Charles Kerr on 2012-04-09
Approved revision: 268
Merged at revision: 268
Proposed branch: lp:~ted/indicator-messages/telepathy-offline
Merge into: lp:indicator-messages/0.3
Diff against target: 30 lines (+3/-3)
1 file modified
src/status-provider-mc5.c (+3/-3)
To merge this branch: bzr merge lp:~ted/indicator-messages/telepathy-offline
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2012-04-06 Approve on 2012-04-09
Review via email: mp+101140@code.launchpad.net

Description of the change

Make it so that when your session lauches you're offline instead of disconnected. That way the items are visible and you can go online. Which seems like a feature :-)

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

I'm surprised there's not a ticket associated with this, it seems like a pretty big catch...

review: Approve

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 2011-07-02 12:15:22 +0000
3+++ src/status-provider-mc5.c 2012-04-06 18:20:23 +0000
4@@ -137,7 +137,7 @@
5 {
6 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
7
8- priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
9+ priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
10 priv->manager = NULL;
11
12 DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
13@@ -219,7 +219,7 @@
14 priv->manager = NULL;
15 }
16
17- priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
18+ priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
19 g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE);
20 }
21
22@@ -282,7 +282,7 @@
23 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
24
25 if (priv->manager == NULL) {
26- return STATUS_PROVIDER_STATUS_DISCONNECTED;
27+ return STATUS_PROVIDER_STATUS_OFFLINE;
28 }
29
30 return priv->status;

Subscribers

People subscribed via source and target branches