Mercurial > hg > xemacs-beta
comparison src/select-gtk.c @ 4985:358aa3bb603f
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 12:12:28 -0600 |
parents | f23cd0184dcf 3c3c1d139863 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
4984:f23cd0184dcf | 4985:358aa3bb603f |
---|---|
57 if (EQ (sym, QPRIMARY)) return GDK_SELECTION_PRIMARY; | 57 if (EQ (sym, QPRIMARY)) return GDK_SELECTION_PRIMARY; |
58 if (EQ (sym, QSECONDARY)) return GDK_SELECTION_SECONDARY; | 58 if (EQ (sym, QSECONDARY)) return GDK_SELECTION_SECONDARY; |
59 | 59 |
60 { | 60 { |
61 const Extbyte *nameext; | 61 const Extbyte *nameext; |
62 LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), nameext, Qctext); | 62 nameext = LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), Qctext); |
63 return gdk_atom_intern (nameext, only_if_exists ? TRUE : FALSE); | 63 return gdk_atom_intern (nameext, only_if_exists ? TRUE : FALSE); |
64 } | 64 } |
65 } | 65 } |
66 | 66 |
67 static Lisp_Object | 67 static Lisp_Object |
74 Ibyte *intstr; | 74 Ibyte *intstr; |
75 Extbyte *str = gdk_atom_name (atom); | 75 Extbyte *str = gdk_atom_name (atom); |
76 | 76 |
77 if (! str) return Qnil; | 77 if (! str) return Qnil; |
78 | 78 |
79 EXTERNAL_TO_C_STRING (str, intstr, Qctext); | 79 intstr = EXTERNAL_TO_ITEXT (str, Qctext); |
80 g_free (str); | 80 g_free (str); |
81 return intern_istring (intstr); | 81 return intern_istring (intstr); |
82 } | 82 } |
83 } | 83 } |
84 | 84 |