Merge lp:~agateau/indicator-applet/fix-crash-in-get_indicator_list into lp:indicator-applet/0.4

[Aurélien Gâteau]

[Ted Gould (ted)]

Aurelien,

I think that this has already been fixed in trunk. I think you need to update your branch from the current trunk.

http://bazaar.launchpad.net/%7Eindicator-applet-developers/indicator-applet/applet/revision/321

--Ted

review: Disapprove

[Aurélien Gâteau (agateau)]

> Aurelien,
>
> I think that this has already been fixed in trunk. I think you need to update
> your branch from the current trunk.

Oups, you are right (even if my version is a bit simpler).

Unmerged revisions

323. By Aurélien Gâteau on 2009-08-12

Do not crash while getting indicator list if one of them is hidden.

=== modified file 'libindicate/server.c'
--- libindicate/server.c	2009-07-21 16:41:46 +0000
+++ libindicate/server.c	2009-08-12 13:51:51 +0000
@@ -944,12 +944,11 @@
 	*indicators = g_array_sized_new(FALSE, FALSE, sizeof(guint), g_slist_length(priv->indicators) - priv->num_hidden);
 
 	GSList * iter;
-	int i;
-	for (iter = priv->indicators, i = 0; iter != NULL; iter = iter->next, i++) {
+	for (iter = priv->indicators; iter != NULL; iter = iter->next) {
 		IndicateIndicator * indicator = INDICATE_INDICATOR(iter->data);
 		if (indicate_indicator_is_visible(indicator)) {
 			guint id = indicate_indicator_get_id(indicator);
-			g_array_insert_val(*indicators, i, id);
+			g_array_append_val(*indicators, id);
 		}
 	}