[empathy] theme-adium: still execute the start of the script if ressource is missing



commit b205d66b7ecf9c0eb6aa89ff4f67b73bc211bc07
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Sep 24 16:38:25 2013 +0200

    theme-adium: still execute the start of the script if ressource is missing
    
    This fix a regression introduced by 19e784a4b2655db5cf414c7ce43662a9adb9d0c6.
    
    If empathy-chat.js can't be find (like in the preferences dialog) we still
    want to execute the start of the script.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708616

 libempathy-gtk/empathy-theme-adium.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 6523159..a870702 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -732,12 +732,13 @@ 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);
+  if (bytes != NULL)
+    {
+      js = (const gchar *) g_bytes_get_data (bytes, NULL);
+      g_string_prepend (string, js);
+      g_bytes_unref (bytes);
+    }
 
   script = g_string_free (string, FALSE);
   webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self), script);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]