aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-10-15 17:51:07 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-10-15 17:51:07 +0800
commitcc996612801193a05bde002c2535f7ab2ed93d20 (patch)
tree8172e199af1405771c4b70d0e58e0d2f4dae4253 /libempathy-gtk
parentcbe7490a7b1c3a924257a76db2a7e1083a6bd02d (diff)
downloadgsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar.gz
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar.bz2
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar.lz
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar.xz
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.tar.zst
gsoc2013-empathy-cc996612801193a05bde002c2535f7ab2ed93d20.zip
Don't warning if we try to load a NULL icon.
2007-10-15 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/empathy-ui-utils.c: Don't warning if we try to load a NULL icon. * data/Makefile.am: * data/aim.profile: * data/sofiasip.profile: Add AIM and SIP profiles. Fixes bug #457740 (Jamey Hicks). svn path=/trunk/; revision=376
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-ui-utils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index fe032c9ee..eabdc0a46 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -530,6 +530,10 @@ empathy_pixbuf_from_icon_name (const gchar *icon_name,
gint w, h;
gint size = 48;
+ if (!icon_name) {
+ return NULL;
+ }
+
theme = gtk_icon_theme_get_default ();
if (gtk_icon_size_lookup (icon_size, &w, &h)) {