diff -crN ./libbonoboui/bonobo/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/Makefile.am *** ./libbonoboui/bonobo/Makefile.am Tue Jun 10 16:36:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/Makefile.am Thu Oct 16 13:11:49 2003 *************** *** 80,86 **** -no-undefined libbonoboui_2_la_LIBADD = \ ! $(BONOBOUI_LIBS) ${X_LIBS} libbonoboui_2_la_SOURCES = \ bonobo-a11y.c \ --- 80,89 ---- -no-undefined libbonoboui_2_la_LIBADD = \ ! $(BONOBOUI_LIBS) \ ! $(POPT_LIBS) \ ! $(X_LIBS) \ ! -lX11 libbonoboui_2_la_SOURCES = \ bonobo-a11y.c \ diff -crN ./libbonoboui/bonobo/bonobo-canvas-item.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-canvas-item.c *** ./libbonoboui/bonobo/bonobo-canvas-item.c Tue Jun 10 16:17:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-canvas-item.c Thu Oct 16 13:11:57 2003 *************** *** 29,35 **** GNOME_CLASS_BOILERPLATE (BonoboCanvasItem, bonobo_canvas_item, GObject, ! GNOME_TYPE_CANVAS_ITEM); typedef struct { POA_Bonobo_Canvas_ComponentProxy proxy_servant; --- 29,35 ---- GNOME_CLASS_BOILERPLATE (BonoboCanvasItem, bonobo_canvas_item, GObject, ! GNOME_TYPE_CANVAS_ITEM) typedef struct { POA_Bonobo_Canvas_ComponentProxy proxy_servant; *************** *** 47,53 **** enum { PROP_0, PROP_CORBA_FACTORY, ! PROP_CORBA_UI_CONTAINER, }; /* --- 47,53 ---- enum { PROP_0, PROP_CORBA_FACTORY, ! PROP_CORBA_UI_CONTAINER }; /* diff -crN ./libbonoboui/bonobo/bonobo-dock-band.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-band.h *** ./libbonoboui/bonobo/bonobo-dock-band.h Wed Jun 5 18:17:50 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-band.h Fri Jul 4 12:56:25 2003 *************** *** 66,72 **** guint num_children : 8; guint new_for_drag : 1; gboolean doing_drag : 1; ! GtkOrientation orientation : 1; /*< private >*/ BonoboDockBandPrivate *_priv; --- 66,72 ---- guint num_children : 8; guint new_for_drag : 1; gboolean doing_drag : 1; ! unsigned int orientation : 1; /* GtkOrientation */ /*< private >*/ BonoboDockBandPrivate *_priv; diff -crN ./libbonoboui/bonobo/bonobo-dock-item.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-item.h *** ./libbonoboui/bonobo/bonobo-dock-item.h Wed Jun 5 18:17:50 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-item.h Fri Jul 4 12:57:00 2003 *************** *** 79,86 **** /* Position of the floating window. */ gint16 float_x, float_y; ! BonoboDockItemBehavior behavior : 5; ! GtkOrientation orientation : 1; guint float_window_mapped : 1; guint is_floating : 1; --- 79,86 ---- /* Position of the floating window. */ gint16 float_x, float_y; ! unsigned int behavior : 5; /* BonoboDockItemBehavior */ ! unsigned int orientation : 1; /* GtkOrientation */ guint float_window_mapped : 1; guint is_floating : 1; diff -crN ./libbonoboui/bonobo/bonobo-dock.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock.c *** ./libbonoboui/bonobo/bonobo-dock.c Mon Apr 14 10:14:51 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock.c Thu Oct 16 14:57:14 2003 *************** *** 32,38 **** #include GNOME_CLASS_BOILERPLATE (BonoboDock, bonobo_dock, ! GtkContainer, GTK_TYPE_CONTAINER); #define noBONOBO_DOCK_DEBUG --- 32,38 ---- #include GNOME_CLASS_BOILERPLATE (BonoboDock, bonobo_dock, ! GtkContainer, GTK_TYPE_CONTAINER) #define noBONOBO_DOCK_DEBUG diff -crN ./libbonoboui/bonobo/bonobo-ui-private.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-private.h *** ./libbonoboui/bonobo/bonobo-ui-private.h Mon May 12 11:27:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-private.h Thu Oct 16 13:12:08 2003 *************** *** 44,50 **** #ifndef DEBUG_UI ! static inline void dprintf (const char *format, ...) { }; #else /* DEBUG_UI */ --- 44,50 ---- #ifndef DEBUG_UI ! static inline void dprintf (const char *format, ...) { } #else /* DEBUG_UI */ diff -crN ./libbonoboui/bonobo/bonobo-ui-util.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-util.c *** ./libbonoboui/bonobo/bonobo-ui-util.c Thu Aug 7 14:50:32 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-util.c Thu Oct 16 13:12:17 2003 *************** *** 91,97 **** return (nibble1 << 4) + nibble2; } ! static inline const guint32 read_four_bytes (const char *pos) { return ((read_byte (pos) << 24) | --- 91,97 ---- return (nibble1 << 4) + nibble2; } ! static inline guint32 read_four_bytes (const char *pos) { return ((read_byte (pos) << 24) | diff -crN ./libbonoboui/doc/api/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/doc/api/Makefile.am *** ./libbonoboui/doc/api/Makefile.am Tue Jun 10 16:36:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/doc/api/Makefile.am Mon Nov 3 16:31:52 2003 *************** *** 79,84 **** --- 79,85 ---- # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ @CFLAGS@ \ + @CPPFLAGS@ \ -I$(top_srcdir) \ $(BONOBOUI_CFLAGS) diff -crN ./libbonoboui/tests/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/tests/Makefile.am *** ./libbonoboui/tests/Makefile.am Mon May 19 16:22:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/tests/Makefile.am Thu Oct 16 13:12:41 2003 *************** *** 25,31 **** $(WARN_CFLAGS) \ $(BONOBOUI_CFLAGS) ! LDADD = $(top_builddir)/bonobo/libbonoboui-2.la $(BONOBOUI_LIBS) test_ui_SOURCES = test-ui.c test_ui_auto_SOURCES = test-ui-auto.c --- 25,31 ---- $(WARN_CFLAGS) \ $(BONOBOUI_CFLAGS) ! LDADD = $(top_builddir)/bonobo/libbonoboui-2.la $(BONOBOUI_LIBS) -lX11 $(POPT_LIBS) test_ui_SOURCES = test-ui.c test_ui_auto_SOURCES = test-ui-auto.c