From e487926900bb21e5f0af642429d37ec8d90f4c3d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 11 Oct 2011 16:46:23 -0400 Subject: Use default variant if we can't find any variants We use to crash here trying to get the first element of an empty GPtrArray. https://bugzilla.gnome.org/show_bug.cgi?id=660586 --- libempathy-gtk/empathy-theme-adium.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libempathy-gtk/empathy-theme-adium.c') diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 8877a2796..c5d9d2090 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -1753,8 +1753,11 @@ adium_info_dup_path_for_variant (GHashTable *info, return g_strdup ("main.css"); } - /* Verify the variant exists, fallback to the first one */ variants = empathy_adium_info_get_available_variants (info); + if (variants->len == 0) + return g_strdup ("main.css"); + + /* Verify the variant exists, fallback to the first one */ for (i = 0; i < variants->len; i++) { if (!tp_strdiff (variant, g_ptr_array_index (variants, i))) { break; -- cgit v1.2.3