[Glade-devel] Glade 3 development

[damon karuna uklinux net (Damon Chaplin)]

--=-RhMfr52090MOrwDImwMU
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Wed, 2004-04-21 at 22:19, Joaquin Cuenca Abela wrote:

> As far as I can see, these two bugs are fixed with my today commit.
> If you still hit these problems, please let me know.

I had trouble compiling it after your commit.
I've attached a patch that made it compile for me.

Is the marshallers file supposed to be autogenerated?

Damon


--=-RhMfr52090MOrwDImwMU
Content-Disposition: attachment; filename=glade3.patch
Content-Type: text/x-patch; name=glade3.patch; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/glade3/src/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- Makefile.am 9 Mar 2004 21:17:33 -0000       1.27
+++ Makefile.am 22 Apr 2004 11:48:37 -0000
@@ -55,7 +55,8 @@
        glade-menu-editor.c \
        glade-keys-dialog.c \
        glade-transform.c \
-       glade-id-allocator.c
+       glade-id-allocator.c \
+       glade-marshallers.c
 
 noinst_HEADERS = \
        glade.h \
@@ -86,4 +87,5 @@
        glade-menu-editor.h \
        glade-keys-dialog.h \
        glade-transform.h \
-       glade-id-allocator.h
+       glade-id-allocator.h \
+       glade-marshallers.h
Index: glade-widget.h
===================================================================
RCS file: /cvs/gnome/glade3/src/glade-widget.h,v
retrieving revision 1.32
diff -u -r1.32 glade-widget.h
--- glade-widget.h      21 Apr 2004 21:03:40 -0000      1.32
+++ glade-widget.h      22 Apr 2004 11:49:07 -0000
@@ -4,6 +4,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include "glade-types.h"
 
 G_BEGIN_DECLS
  
@@ -14,8 +15,7 @@
 #define GLADE_IS_WIDGET_KLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_WIDGET))
 #define GLADE_WIDGET_GET_KLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_WIDGET, GladeWidgetKlass))
 
-typedef struct _GladeWidget            GladeWidget;
-typedef struct _GladeWidgetKlass       GladeWidgetKlass;
+typedef struct _GladeWidgetKlass       GladeWidgetKlass;
 
 struct _GladeWidget
 {
@@ -110,4 +110,4 @@
 
 G_END_DECLS
 
-#endif __GLADE_WIDGET_H__
+#endif /* __GLADE_WIDGET_H__ */

--=-RhMfr52090MOrwDImwMU--