Move markup to glib, use G-STRING.

diff --git a/glib/cl-gtk2-glib.asd b/glib/cl-gtk2-glib.asd
index 3db1337..1cc7551 100644 (file)
--- a/glib/cl-gtk2-glib.asd
+++ b/glib/cl-gtk2-glib.asd
@@ -12,6 +12,7 @@
                (:file "glib.gerror")
                (:file "glib.utils")
                (:file "glib.rand")
+               (:file "glib.markup")
 
                (:file "gobject.init")
                (:file "gobject.ffi.package")

diff --git a/glib/glib.markup.lisp b/glib/glib.markup.lisp
new file mode 100644 (file)
index 0000000..c7c1df9
--- /dev/null
+++ b/glib/glib.markup.lisp
@@ -0,0 +1,10 @@
+(in-package :glib)
+
+(defcfun g-markup-escape-text g-string
+  (text :string)
+  (length :int))
+
+(defun markup-escape-text (string)
+  (g-markup-escape-text string (length string)))
+
+(export 'markup-escape-text)

diff --git a/gtk/cl-gtk2-gtk.asd b/gtk/cl-gtk2-gtk.asd
index 7b10475..f2e3261 100644 (file)
--- a/gtk/cl-gtk2-gtk.asd
+++ b/gtk/cl-gtk2-gtk.asd
@@ -69,8 +69,7 @@
                (:file "gtk.tree-model-filter")
                (:file "gtk.clipboard")
                (:file "gtk.info-bar")
-              (:file "gtk.spinner")
-              (:file "gtk.markup")
+               (:file "gtk.spinner")
 
                (:file "gtk.main-loop-events")
 

diff --git a/gtk/gtk.markup.lisp b/gtk/gtk.markup.lisp
deleted file mode 100644 (file)
index b574a9b..0000000
--- a/gtk/gtk.markup.lisp
+++ /dev/null
@@ -1,11 +0,0 @@
-(in-package :gtk)
-
-(defcfun |g_markup_escape_text| :string
-  (raw  :string)
-  (size :int))
-
-(defun markup-escape-text (raw)
-  (cffi:with-foreign-string (s raw)
-    (|g_markup_escape_text| s (length raw))))
-
-(export 'markup-escape-text)