Updating from upstream with two (count them) two applets

installed in the source.

2 files changed, 29 insertions, 3 deletions

diff --git a/libindicate/indicator.c b/libindicate/indicator.c
index cb257eb..18cdc4a 100644
--- a/libindicate/indicator.c
+++ b/libindicate/indicator.c
@@ -220,16 +220,39 @@ indicate_indicator_new_with_server (IndicateServer * server)
 
 	IndicateIndicator * indicator = g_object_new(INDICATE_TYPE_INDICATOR, NULL);
 
+	indicate_indicator_set_server (indicator, server);
+
+	return indicator;
+}
+
+/**
+	indicate_indicator_set_server:
+	@indicator: a #IndicateIndicator to act on
+	@server: the #IndicateServer which should be associated with @indicator
+
+	Defines which server this indicator must be associated to.  Also, adds a
+	reference to the server.
+*/
+void
+indicate_indicator_set_server (IndicateIndicator * indicator, IndicateServer * server)
+{
 	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
+
+	if (server != NULL) {
+		g_object_ref(server);
+	}
+
 	if (priv->server != NULL) {
+		indicate_server_remove_indicator (priv->server, indicator);
 		g_object_unref(priv->server);
-		priv->server = NULL;
 	}
 
 	priv->server = server;
-	g_object_ref(priv->server);
+	if (server != NULL) {
+		indicate_server_add_indicator (server, indicator);
+	}
 
-	return indicator;
+	return;
 }
 
 
diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index 20b998d..b2e33c0 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -119,6 +119,9 @@ void indicate_indicator_hide (IndicateIndicator * indicator);
 
 gboolean indicate_indicator_is_visible (IndicateIndicator * indicator);
 
+/* Define this indicator server */
+void indicate_indicator_set_server (IndicateIndicator * indicator, IndicateServer * server);
+
 /* Every entry has an ID, here's how to get it */
 guint indicate_indicator_get_id (IndicateIndicator * indicator);