diff src/objects-gtk.c @ 4985:358aa3bb603f

Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 12:12:28 -0600
parents 3c3c1d139863
children
line wrap: on
line diff
--- a/src/objects-gtk.c	Fri Feb 05 12:11:12 2010 -0600
+++ b/src/objects-gtk.c	Fri Feb 05 12:12:28 2010 -0600
@@ -208,7 +208,7 @@
   GdkColor c;
   const char *extname;
 
-  TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext);
+  extname = LISP_STRING_TO_EXTERNAL (color, Qctext);
 
   if (gdk_color_parse (extname, &c) != TRUE)
       return(0);
@@ -237,7 +237,7 @@
   XFontStruct *xf;
   const char *extname;
 
-  TO_EXTERNAL_FORMAT (LISP_STRING, f->name, C_STRING_ALLOCA, extname, Qctext);
+  extname = LISP_STRING_TO_EXTERNAL (f->name, Qctext);
 
   gf = gdk_font_load (extname);
 
@@ -383,7 +383,7 @@
 {
   const char *patternext;
 
-  TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary);
+  patternext = LISP_STRING_TO_EXTERNAL (pattern, Qbinary);
 
   return (__gtk_font_list_internal (patternext));
 }