diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-28 10:36:48 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-28 10:36:48 -0500 |
| commit | cf3acf865a0a6e53389f331191ed0a6d89954c3c (patch) | |
| tree | 69a4ab124ae47556aa8004f16d414f4fb4392188 /src/indicator-messages.c | |
| parent | 4052c0ed4c92c7d2dbf6b27b1ccfbb56c1523a9e (diff) | |
| parent | 84a1d59e2a031e072721e976974443ad37ff4c64 (diff) | |
| download | ayatana-indicator-messages-cf3acf865a0a6e53389f331191ed0a6d89954c3c.tar.gz ayatana-indicator-messages-cf3acf865a0a6e53389f331191ed0a6d89954c3c.tar.bz2 ayatana-indicator-messages-cf3acf865a0a6e53389f331191ed0a6d89954c3c.zip | |
* New upstream release.
* Fix memory leak (LP: #690668)
Diffstat (limited to 'src/indicator-messages.c')
| -rw-r--r-- | src/indicator-messages.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 2476d4d..1b96464 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -653,6 +653,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, width, height, GDK_INTERP_BILINEAR); + g_object_unref(pixbuf); } else { g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf)); resized_pixbuf = pixbuf; @@ -660,10 +661,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf); - /* The other pixbuf should be free'd by the dbusmenu. */ - if (resized_pixbuf != pixbuf) { - g_object_unref(resized_pixbuf); - } + g_object_unref(resized_pixbuf); gtk_widget_show(mi_data->icon); } else { @@ -715,6 +713,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm width, height, GDK_INTERP_BILINEAR); + g_object_unref(pixbuf); } else { g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf)); resized_pixbuf = pixbuf; @@ -722,10 +721,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf); - /* The other pixbuf should be free'd by the dbusmenu. */ - if (resized_pixbuf != pixbuf) { - g_object_unref(resized_pixbuf); - } + g_object_unref(resized_pixbuf); } gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0); |