[empathy/gnome-3-2] Use default variant if we can't find any variants
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-3-2] Use default variant if we can't find any variants
- Date: Tue, 11 Oct 2011 21:48:12 +0000 (UTC)
commit 3b152eee315b32c0e8d844137843bb3f9a0c554b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Oct 11 16:46:23 2011 -0400
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 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index f81329b..fde9d92 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -1739,8 +1739,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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]