From b1e72a50c92348a707396990cea5474143bff8cf Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 12:22:35 -0500 Subject: Cherry picked fix to check for a null string as the attention icon --- debian/changelog | 6 ++++++ src/application-service-appstore.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7cbeb21..da11c18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.0.13-0ubuntu6) lucid; urgency=low + + * Cherry picked fix to check for a null string as the attention icon + + -- Ken VanDine Fri, 19 Feb 2010 12:21:39 -0500 + indicator-application (0.0.13-0ubuntu5) lucid; urgency=low * debian/patches/unregister.patch diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index ec6da50..b189a45 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -397,7 +397,7 @@ apply_status (Application * app, ApplicationStatus status) } else { /* Figure out which icon we should be using */ gchar * newicon = app->icon; - if (status == APP_STATUS_ATTENTION && app->aicon != NULL) { + if (status == APP_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') { newicon = app->aicon; } -- cgit v1.2.3