Propper handling of gerror

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index 6b278ed003b076346228c4ca545e4d9f77c48499..edfaa76886838ccb32dad5d8527b48b8e81f8751 100644 (file)
--- 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.
 
 ;; 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.7 2006/02/05 12:54:55 espen Exp $
+;; $Id: gtkaction.lisp,v 1.8 2006/02/28 16:30:37 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -180,24 +180,20 @@ (defbinding %ui-manager-add-ui-from-string (ui-manager ui) int
   (ui-manager ui-manager)
   (ui string)
   ((length ui) int)
   (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))
 
 (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)
 
 (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))
 
 (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))
 
 (defbinding %ui-manager-new-merge-id () unsigned-int
   (ui-manager ui-manager))