From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Sun, 12 Jul 2009 09:57:22 +0000 (+0400)
Subject: Use parse-signal-name in emit-signal
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9832eb7bf5322515a990a0166963ca65510e23ec;p=cl-gtk2.git

Use parse-signal-name in emit-signal
---

diff --git a/glib/gobject.signals.lisp b/glib/gobject.signals.lisp
index 4efa669..c2a2a29 100644
--- a/glib/gobject.signals.lisp
+++ b/glib/gobject.signals.lisp
@@ -6,24 +6,24 @@
 @arg[signal-name]{a string specifying the signal}
 @arg[args]{arguments for the signal}
 @return{none}"
-  (let ((signal-id (g-signal-lookup signal-name (g-type-from-object (pointer object)))))
-    (when (= signal-id 0)
+  (let* ((object-type (g-type-from-object (pointer object)))
+         (signal-info (parse-signal-name object-type signal-name)))
+    (unless signal-info
       (error "Signal ~A not found on object ~A" signal-name object))
-    (with-foreign-object (q 'g-signal-query)
-      (g-signal-query signal-id q)
-      (with-foreign-object (params 'g-value (+ 1 (foreign-slot-value q 'g-signal-query :n-params)))
-        (set-g-value (mem-aref params 'g-value 0) object (g-type-from-object (pointer object)) :zero-g-value t)
-        (iter (for i from 0 below (foreign-slot-value q 'g-signal-query :n-params))
+    (let ((params-count (length (signal-info-param-types object))))
+      (with-foreign-object (params 'g-value (1+ params-count))
+        (set-g-value (mem-aref params 'g-value 0) object object-type :zero-g-value t)
+        (iter (for i from 0 below params-count)
               (for arg in args)
-              (for type = (mem-aref (foreign-slot-value q 'g-signal-query :param-types) '(g-type-designator :mangled-p t) i))
+              (for type in (signal-info-param-types signal-info))
               (set-g-value (mem-aref params 'g-value (1+ i)) arg type :zero-g-value t))
         (prog1
-            (if (= (foreign-slot-value q 'g-signal-query :return-type) +g-type-void+)
-                (g-signal-emitv params signal-id signal-name (null-pointer))
+            (if (= (g-type-numeric (signal-info-return-type signal-info)) +g-type-void+)
+                (g-signal-emitv params (signal-info-id signal-info) signal-name (null-pointer))
                 (with-foreign-object (return-value 'g-value)
                   (g-value-zero return-value)
-                  (g-value-init return-value (foreign-slot-value q 'g-signal-query :return-type))
+                  (g-value-init return-value (signal-info-return-type signal-info))
                   (prog1 (parse-gvalue return-value)
                     (g-value-unset return-value))))
-          (iter (for i from 0 below (foreign-slot-value q 'g-signal-query :n-params))
-                (g-value-unset (mem-aref params 'g-value (1+ i)))))))))
\ No newline at end of file
+          (iter (for i from 0 below (1+ params-count))
+                (g-value-unset (mem-aref params 'g-value i))))))))
\ No newline at end of file