aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2008-12-29 17:11:42 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-12-29 17:11:42 +0800
commit0563614cc0902b6cd2d2d2b980baa720f87b453a (patch)
tree6a8837fb74f7319f959532a55be5b1a3561a07b0
parentf238447fca3a3685b27969cbb5cef530dbe57632 (diff)
downloadgsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar.gz
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar.bz2
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar.lz
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar.xz
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.tar.zst
gsoc2013-empathy-0563614cc0902b6cd2d2d2b980baa720f87b453a.zip
Don't unref NULL avatar used as chat window icon
This only happens if you set a secret gconf key, I think. Signed-off-by: Will Thompson <will.thompson@collabora.co.uk> svn path=/trunk/; revision=2016
-rw-r--r--src/empathy-chat-window.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 8a6653ae5..e0e9dae5d 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -325,7 +325,10 @@ chat_window_update (EmpathyChatWindow *window)
remote_contact = empathy_chat_get_remote_contact (priv->current_chat);
icon = empathy_pixbuf_avatar_from_contact_scaled (remote_contact, 0, 0);
gtk_window_set_icon (GTK_WINDOW (priv->dialog), icon);
- g_object_unref (icon);
+
+ if (icon != NULL) {
+ g_object_unref (icon);
+ }
} else {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), NULL);
}