X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/93271bfea623296397e990bda00937729322f15f..5f1ff3262acb0b3b90ec494fb90b3b659adb6019:/gtk/gtkaction.lisp

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index 13495c6..edfaa76 100644
--- a/gtk/gtkaction.lisp
+++ b/gtk/gtkaction.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkaction.lisp,v 1.6 2005/10/21 11:50:50 espen Exp $
+;; $Id: gtkaction.lisp,v 1.8 2006/02/28 16:30:37 espen Exp $
 
 
 (in-package "GTK")
@@ -85,7 +85,7 @@
 
 (defmethod initialize-instance ((action radio-action) &key group)
   (call-next-method)
-  (setf (slot-value action 'self) (sap-int (proxy-location action)))
+  (setf (slot-value action 'self) (sap-int (foreign-location action)))
   (when group
     (add-to-radio-group action group)))
 
@@ -180,24 +180,20 @@
   (ui-manager ui-manager)
   (ui string)
   ((length ui) int)
-  (gerror pointer :out))
+  (gerror gerror-signal :out))
+
+(defgeneric ui-manager-add-ui (ui-manager ui-spec))
 
 (defmethod ui-manager-add-ui ((ui-manager ui-manager) (ui-spec string))
-  (let ((id (%ui-manager-add-ui-from-string ui-manager ui-spec)))
-    (when (zerop id)
-      (error "We need to handle GError in som way"))
-    id))
+  (%ui-manager-add-ui-from-string ui-manager ui-spec))
 
 (defbinding %ui-manager-add-ui-from-file () int
   (ui-manager ui-manager)
   (filename pathname)
-  (gerror pointer :out))
+  (gerror gerror-signal :out))
 
 (defmethod ui-manager-add-ui ((ui-manager ui-manager) (path pathname))
-  (let ((id (%ui-manager-add-ui-from-file ui-manager path)))
-    (when (zerop id)
-      (error "We need to handle GError in som way"))
-    id))
+  (%ui-manager-add-ui-from-file ui-manager path))
 
 (defbinding %ui-manager-new-merge-id () unsigned-int
   (ui-manager ui-manager))