[anjuta] libanjuta: Glib-Error boxed type is now in Glib

[Johannes Schmid <jhs src gnome org>]

commit 466189a96b6e0f70091723544a1c25c02fdf53d6
Author: Johannes Schmid <jhs gnome org>
Date:   Wed Aug 18 18:36:04 2010 +0200

    libanjuta: Glib-Error boxed type is now in Glib

 configure.in                       |    3 ++
 libanjuta/Makefile.am              |    3 --
 libanjuta/anjuta-error.c           |   40 ------------------------------------
 libanjuta/anjuta-error.h           |   37 ---------------------------------
 libanjuta/interfaces/libanjuta.idl |    5 +---
 libfoocanvas/foo-canvas-marshal.c  |    2 +
 6 files changed, 6 insertions(+), 84 deletions(-)
---
diff --git a/configure.in b/configure.in
index 154ee10..922fbc2 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ ANJUTA_VERSION=anjuta_version
 AC_SUBST(ANJUTA_VERSION)
 
 dnl Anjuta core
+GLIB_REQUIRED=2.25.15
 GTK_REQUIRED=2.20.0
 GTHREAD_REQUIRED=2.22.0
 GDK_PIXBUF_REQUIRED=2.0.0
@@ -145,6 +146,8 @@ dnl Check base modules
 PKG_CHECK_MODULES([ANJUTA], 
    [gthread-2.0 >= $GTHREAD_REQUIRED 
 	unique-1.0 >= $UNIQUE_REQUIRED
+	glib-2.0 >= $GLIB_REQUIRED
+	gio-2.0 >= $GLIB_REQUIRED
 	gtk+-2.0 >= $GTK_REQUIRED
 	gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
 	gconf-2.0 >= $GCONF_REQUIRED
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index 8032893..8abdfc8 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -72,8 +72,6 @@ libanjuta_la_SOURCES= \
 	cell-renderer-captioned-image.h \
 	e-splash.h \
 	e-splash.c \
-	anjuta-error.c \
-	anjuta-error.h \
 	anjuta-vcs-status.h \
 	anjuta-vcs-status-tree-view.c \
 	anjuta-vcs-status-tree-view.h \
@@ -145,7 +143,6 @@ libanjuta_include = \
 	anjuta-session.h \
 	anjuta-save-prompt.h \
 	anjuta-serializer.h \
-	anjuta-error.h \
 	resources.h \
 	anjuta-vcs-status-tree-view.h \
 	anjuta-vcs-status.h \
diff --git a/libanjuta/interfaces/libanjuta.idl b/libanjuta/interfaces/libanjuta.idl
index 0ec8ef2..bd3ae29 100644
--- a/libanjuta/interfaces/libanjuta.idl
+++ b/libanjuta/interfaces/libanjuta.idl
@@ -631,9 +631,7 @@ interface IAnjutaIterable
  */
 interface IAnjutaBuilder
 {
-	#include <libanjuta/anjuta-error.h>
-
-	/**
+  /**
    * IAnjutaBuilderError:
    * @IANJUTA_BUILDER_SUCCEED: Build succeeded
    * @IANJUTA_BUILDER_FAILED: Build failed
@@ -3643,7 +3641,6 @@ interface IAnjutaWizard
 interface IAnjutaDebugger
 {
 	#include "ianjuta-message-view.h"
-	#include <libanjuta/anjuta-error.h>
 	#include <sys/types.h>
 	#include <gio/gio.h>
 
diff --git a/libfoocanvas/foo-canvas-marshal.c b/libfoocanvas/foo-canvas-marshal.c
index d95d474..acda3f5 100644
--- a/libfoocanvas/foo-canvas-marshal.c
+++ b/libfoocanvas/foo-canvas-marshal.c
@@ -23,6 +23,7 @@
 #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
 #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
 #else /* !G_ENABLE_DEBUG */
 /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
  *          Do not access GValues directly in your code. Instead, use the
@@ -46,6 +47,7 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
 #endif /* !G_ENABLE_DEBUG */