diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-06-23 12:13:22 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-23 12:13:22 -0400 |
| commit | 30982b6d4e29a8798c9942151f30c2b90500e355 (patch) | |
| tree | b8499c2db9082a56fea1054392106a3d711502ed /gtk/gtkicontheme.c | |
| parent | 12a40cf8a616924f15a8020c2af4e986012f41c9 (diff) | |
| download | gtk+-30982b6d4e29a8798c9942151f30c2b90500e355.tar.gz | |
GtkIconTheme: Be more careful when warning
It sucks when printing a warning causes gnome-shell to crash,
so be more careful about icon names being NULL here.
Diffstat (limited to 'gtk/gtkicontheme.c')
| -rw-r--r-- | gtk/gtkicontheme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index c3385e0f62..8a1f83568e 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -4208,12 +4208,12 @@ gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, g_object_unref (pixbuf); } - if (icon_info->dir_type != ICON_THEME_DIR_SCALABLE) - g_warning ("Symbolic icon %s is not in a scalable icon theme directory", - icon_info->key.icon_names[0]); + if (icon_info->dir_type == ICON_THEME_DIR_UNTHEMED) + g_warning ("Symbolic icon %s is not in an icon theme directory", + icon_info->key.icon_names ? icon_info->key.icon_names[0] : icon_info->filename); else if (icon_info->dir_size * icon_info->dir_scale != icon_info->symbolic_size) g_warning ("Symbolic icon %s of size %d is in an icon theme directory of size %d", - icon_info->key.icon_names[0], + icon_info->key.icon_names ? icon_info->key.icon_names[0] : icon_info->filename, icon_info->symbolic_size, icon_info->dir_size * icon_info->dir_scale); |