[empathy] theme-adium: deal with g_resources_lookup_data() failing
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] theme-adium: deal with g_resources_lookup_data() failing
- Date: Mon, 2 Sep 2013 15:57:36 +0000 (UTC)
commit 19e784a4b2655db5cf414c7ce43662a9adb9d0c6
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Sep 2 17:33:48 2013 +0200
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 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 0cf74e3..ba359ce 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]