From 19e784a4b2655db5cf414c7ce43662a9adb9d0c6 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 2 Sep 2013 17:33:48 +0200 Subject: theme-adium: deal with g_resources_lookup_data() failing Only empathy-chat registers the gresources so when executing this code from the empathy process (theme preview in the preferences dialog) we don't find the resource. That's fine as this JS code is only used for the infinite callback but best to not warning. https://bugzilla.gnome.org/show_bug.cgi?id=707291 --- libempathy-gtk/empathy-theme-adium.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 0cf74e396..ba359ceb1 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -732,6 +732,9 @@ theme_adium_add_html (EmpathyThemeAdium *self, bytes = g_resources_lookup_data ("/org/gnome/Empathy/Chat/empathy-chat.js", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); + if (bytes == NULL) + return; + js = (const gchar *) g_bytes_get_data (bytes, NULL); g_string_prepend (string, js); g_bytes_unref (bytes); -- cgit v1.2.3