aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-11 07:49:56 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-11 07:49:56 -0500
commitc721d3e241e86287226f2716cbe42e5afefb465b (patch)
tree1a585455a591836582c42b34e16e2d861d45c689
parentf75080c55cd666e48f1a7c9c8bcf62e77cfb7f3b (diff)
parentbb571a4f91682d5d2dfdccfee3826f73ac5457f4 (diff)
downloadlibayatana-indicator-c721d3e241e86287226f2716cbe42e5afefb465b.tar.gz
libayatana-indicator-c721d3e241e86287226f2716cbe42e5afefb465b.tar.bz2
libayatana-indicator-c721d3e241e86287226f2716cbe42e5afefb465b.zip
merge lp:~charlesk/libindicator/lp-946408 to safeguard against invalid images being passed to indicator_image_helper_update()
-rw-r--r--libindicator/indicator-image-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c
index 6ad2a44..63488a1 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libindicator/indicator-image-helper.c
@@ -143,7 +143,7 @@ indicator_image_helper_update (GtkImage * image, const gchar * name)
{
g_return_if_fail(name != NULL);
g_return_if_fail(name[0] != '\0');
- g_return_if_fail(image != NULL);
+ g_return_if_fail(GTK_IS_IMAGE(image));
gboolean seen_previously = FALSE;
/* Build us a GIcon */