diff src/select-gtk.c @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents b13b1b7b11f1
children 2923009caf47
line wrap: on
line diff
--- a/src/select-gtk.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/select-gtk.c	Wed Mar 13 08:54:06 2002 +0000
@@ -1,5 +1,6 @@
 /* GTK selection processing for XEmacs
    Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -64,16 +65,14 @@
   if (atom == GDK_SELECTION_SECONDARY) return (QSECONDARY);
 
   {
-    CIntbyte *intstr;
+    Intbyte *intstr;
     Extbyte *str = gdk_atom_name (atom);
 
     if (! str) return Qnil;
 
-    TO_INTERNAL_FORMAT (C_STRING, str,
-			C_STRING_ALLOCA, intstr,
-			Qctext);
+    EXTERNAL_TO_C_STRING (str, intstr, Qctext);
     g_free (str);
-    return intern (intstr);
+    return intern_int (intstr);
   }
 }
 
@@ -211,7 +210,7 @@
     xfree (data);
   }
 
-  unbind_to (count, Qnil);
+  unbind_to (count);
 
  DONE_LABEL:
 
@@ -351,7 +350,7 @@
   if (selection_reply_timed_out)
     signal_error (Qselection_conversion_error, "timed out waiting for reply from selection owner", Qunbound);
 
-  unbind_to (speccount, Qnil);
+  unbind_to (speccount);
 
   /* otherwise, the selection is waiting for us on the requested property. */
   return select_convert_in (selection_symbol,