Merge lp:~ted/indicator-application/attention-icon into lp:indicator-application/0.4

Proposed by Ted Gould on 2010-02-19
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-application/attention-icon
Merge into: lp:indicator-application/0.4
Diff against target: 11 lines (+1/-1)
1 file modified
src/application-service-appstore.c (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-application/attention-icon
Reviewer Review Type Date Requested Status
David Barth 2010-02-19 Approve on 2010-02-22
Review via email: mp+19728@code.launchpad.net
To post a comment you must log in.
Ted Gould (ted) wrote :

Checks for the NULL string in the attention icon so we don't use that as
well.

86. By Ted Gould on 2010-02-19

Improving the dbus tests so that they have a mock watcher in them.

David Barth (dbarth) :
review: Approve
87. By Ted Gould on 2010-02-22

Properly look for null strings in the attention icon.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/application-service-appstore.c'
2--- src/application-service-appstore.c 2010-02-10 14:32:29 +0000
3+++ src/application-service-appstore.c 2010-02-19 17:12:14 +0000
4@@ -397,7 +397,7 @@
5 } else {
6 /* Figure out which icon we should be using */
7 gchar * newicon = app->icon;
8- if (status == APP_STATUS_ATTENTION && app->aicon != NULL) {
9+ if (status == APP_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') {
10 newicon = app->aicon;
11 }
12

Subscribers

People subscribed via source and target branches