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

[Ted Gould]

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 :-)

[Charles Kerr (charlesk)]

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

review: Approve

=== modified file 'src/status-provider-mc5.c'
--- src/status-provider-mc5.c	2011-07-02 12:15:22 +0000
+++ src/status-provider-mc5.c	2012-04-06 18:20:23 +0000
@@ -137,7 +137,7 @@
 {
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
 
-	priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
+	priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
 	priv->manager = NULL;
 
 	DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
@@ -219,7 +219,7 @@
 			priv->manager = NULL;
 		}
 
-		priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
+		priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
 		g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE);
 	}
 
@@ -282,7 +282,7 @@
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
 
 	if (priv->manager == NULL) {
-		return STATUS_PROVIDER_STATUS_DISCONNECTED;
+		return STATUS_PROVIDER_STATUS_OFFLINE;
 	}
 
 	return priv->status;