From e623416a51aca9f813208a0691585d6fb0dbbb1b Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Fri, 14 Oct 2011 16:22:54 +0100 Subject: [PATCH] adium themes: crash less hard when Template.html is missing If Template.html is missing, then you haven't installed Empathy properly (or set EMPATHY_SRCDIR or whatever in my case). But previously we would just crash later down this function when passing template_html to string_with_format() without checking if it's NULL. This patch makes it fail a little less inscrutably. --- libempathy-gtk/empathy-theme-adium.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index fde9d92..820cd58 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -1918,8 +1918,16 @@ empathy_adium_data_new_with_info (const gchar *path, GHashTable *info) /* template -> empathy's template */ data->custom_template = (template_html != NULL); if (template_html == NULL) { + GError *error = NULL; + tmp = empathy_file_lookup ("Template.html", "data"); - g_file_get_contents (tmp, &template_html, NULL, NULL); + + if (!g_file_get_contents (tmp, &template_html, NULL, &error)) { + g_warning ("couldn't load Empathy's default theme " + "template: %s", error->message); + g_return_val_if_reached (data); + } + g_free (tmp); } -- 1.7.7