summaryrefslogtreecommitdiff
path: root/libwnck/class-group.c
diff options
context:
space:
mode:
authorLampersperger Andreas <lampersperger.andreas@heidenhain.de>2011-01-20 16:56:12 +0100
committerVincent Untz <vuntz@gnome.org>2011-01-20 16:56:33 +0100
commit0ebc4fc1079a5c406840f43a36c30d4f721ddb8c (patch)
tree18a73933d300f13fb930366849dd8821a3d5281b /libwnck/class-group.c
parent26500d170a6faa8fb4158bd0157763ed2a847bc0 (diff)
downloadlibwnck-0ebc4fc1079a5c406840f43a36c30d4f721ddb8c.tar.gz
core: Plug a leak
Diffstat (limited to 'libwnck/class-group.c')
-rw-r--r--libwnck/class-group.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/libwnck/class-group.c b/libwnck/class-group.c
index a636bed..0bcaf9e 100644
--- a/libwnck/class-group.c
+++ b/libwnck/class-group.c
@@ -413,6 +413,7 @@ static void
set_icon (WnckClassGroup *class_group)
{
GdkPixbuf *icon, *mini_icon;
+ gboolean icons_reffed = FALSE;
get_icons_from_applications (class_group, &icon, &mini_icon);
@@ -420,12 +421,15 @@ set_icon (WnckClassGroup *class_group)
get_icons_from_windows (class_group, &icon, &mini_icon);
if (!icon || !mini_icon)
+ {
_wnck_get_fallback_icons (&icon,
DEFAULT_ICON_WIDTH,
DEFAULT_ICON_HEIGHT,
&mini_icon,
DEFAULT_MINI_ICON_WIDTH,
DEFAULT_MINI_ICON_HEIGHT);
+ icons_reffed = TRUE;
+ }
g_assert (icon && mini_icon);
@@ -435,8 +439,14 @@ set_icon (WnckClassGroup *class_group)
if (class_group->priv->mini_icon)
g_object_unref (class_group->priv->mini_icon);
- class_group->priv->icon = g_object_ref (icon);
- class_group->priv->mini_icon = g_object_ref (mini_icon);
+ class_group->priv->icon = icon;
+ class_group->priv->mini_icon = mini_icon;
+
+ if (!icons_reffed)
+ {
+ g_object_ref (class_group->priv->icon);
+ g_object_ref (class_group->priv->mini_icon);
+ }
g_signal_emit (G_OBJECT (class_group), signals[ICON_CHANGED], 0);
}