1 files changed, 5 insertions, 3 deletions

diff --git a/src/image.c b/src/image.c
index 9beb35c484b..0242b502581 100644
--- a/src/image.c
+++ b/src/image.c
@@ -507,12 +507,14 @@ image_create_bitmap_from_file (struct frame *f, Lisp_Object file)
 #endif
 
 #ifdef HAVE_PGTK
-  GError *err;
+  GError *err = NULL;
   ptrdiff_t id;
   void * bitmap = gdk_pixbuf_new_from_file(SSDATA(file), &err);
 
-  if (!bitmap)
+  if (!bitmap) {
+    g_error_free(err);
     return -1;
+  }
 
   id = image_allocate_bitmap_record(f);
 
@@ -10698,7 +10700,7 @@ non-numeric, there is no explicit limit on the size of images.  */);
   DEFSYM (Qxbm, "xbm");
   add_image_type (Qxbm);
 
-#if defined (HAVE_XPM) || defined (HAVE_NS)
+#if defined (HAVE_XPM) || defined (HAVE_NS) || defined (USE_CAIRO)
   DEFSYM (Qxpm, "xpm");
   add_image_type (Qxpm);
 #endif