Indicator Applet

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

  1. fix-crash-in-get_indicator_list
  2. Merge into applet
Proposed by Aurélien Gâteau
Status: Rejected
Rejected by: Aurélien Gâteau
Proposed branch: lp://staging/~agateau/indicator-applet/fix-crash-in-get_indicator_list
Merge into: lp://staging/indicator-applet/0.4
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~agateau/indicator-applet/fix-crash-in-get_indicator_list
Reviewer Review Type Date Requested Status
Ted Gould (community) Disapprove
Review via email: mp+10027@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

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
Revision history for this message
Aurélien Gâteau (agateau) wrote :

> 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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicate/server.c'
2--- libindicate/server.c 2009-07-21 16:41:46 +0000
3+++ libindicate/server.c 2009-08-12 13:51:51 +0000
4@@ -944,12 +944,11 @@
5 *indicators = g_array_sized_new(FALSE, FALSE, sizeof(guint), g_slist_length(priv->indicators) - priv->num_hidden);
6
7 GSList * iter;
8- int i;
9- for (iter = priv->indicators, i = 0; iter != NULL; iter = iter->next, i++) {
10+ for (iter = priv->indicators; iter != NULL; iter = iter->next) {
11 IndicateIndicator * indicator = INDICATE_INDICATOR(iter->data);
12 if (indicate_indicator_is_visible(indicator)) {
13 guint id = indicate_indicator_get_id(indicator);
14- g_array_insert_val(*indicators, i, id);
15+ g_array_append_val(*indicators, id);
16 }
17 }
18

Subscribers

People subscribed via source and target branches

to status/vote changes: