PATCH: libbonoui missing extern "C"s

[murrayc t-online de (Murray Cumming)]

This patch adds some missing G_BEGIN_DECLS and G_BEGIN_ENDS to
libbonoboui headers. We need this for bonobomm.

-- 
Murray Cumming
murrayc usa net
www.murrayc.com

? autom4te.cache
? bonoboui_externc.patch
? libbonoboui.kdevprj
? libbonoboui.kdevses
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.316
diff -u -p -r1.316 ChangeLog
--- ChangeLog	1 Apr 2002 17:58:43 -0000	1.316
+++ ChangeLog	1 Apr 2002 18:59:02 -0000
@@ -1,3 +1,12 @@
+2002-04-01  Murray Cumming  <murrayc usa net>
+
+	* bonobo/bonobo-a11y.h, bonobo/bonobo-control-internal.h,
+	bonobo/bonobo-ui-container.h, bonobo/bonobo-ui-node-private.h,
+	bonobo/bonobo-ui-node.h, bonobo/bonobo-ui-private.h,
+	bonobo/bonobo-ui-util.h, bonobo/bonobo-ui-xml.h,
+	bonobo/bonobo-window.h:	
+	Added G_BEGIN_DECLS/G_END_DECLS for use with C++.
+
 2002-03-29  Mark McLoughlin  <mark skynet ie>
 
 	* bonobo/bonobo-plug.c: (bonobo_plug_button_event): ungrab the
Index: bonobo/bonobo-a11y.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-a11y.h,v
retrieving revision 1.3
diff -u -p -r1.3 bonobo-a11y.h
--- bonobo/bonobo-a11y.h	26 Mar 2002 08:56:54 -0000	1.3
+++ bonobo/bonobo-a11y.h	1 Apr 2002 18:59:02 -0000
@@ -14,6 +14,8 @@
 #include <atk/atkaction.h>
 #include <gtk/gtkwidget.h>
 
+G_BEGIN_DECLS
+
 typedef void     (*BonoboA11YClassInitFn)    (AtkObjectClass *klass);
 
 AtkObject *bonobo_a11y_get_atk_object        (gpointer              widget);
@@ -42,6 +44,8 @@ void       bonobo_a11y_add_actions_inter
 					      /* char * keybinding descr. */
 					      ...);
 				              /* -1 terminated */
+
+G_END_DECLS
 
 #endif /* _BONOBO_A11Y_H_ */
 
Index: bonobo/bonobo-control-internal.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-control-internal.h,v
retrieving revision 1.12
diff -u -p -r1.12 bonobo-control-internal.h
--- bonobo/bonobo-control-internal.h	13 Dec 2001 12:38:25 -0000	1.12
+++ bonobo/bonobo-control-internal.h	1 Apr 2002 18:59:02 -0000
@@ -16,6 +16,8 @@
 #include <bonobo/bonobo-ui-private.h>
 #include <bonobo/bonobo-control-frame.h>
 
+G_BEGIN_DECLS
+
 void     bonobo_control_add_listener            (CORBA_Object        object,
 						 GCallback           fn,
 						 gpointer            user_data,
@@ -46,5 +48,7 @@ void                bonobo_control_set_p
 void                bonobo_plug_set_control         (BonoboPlug         *plug,
 						     BonoboControl      *control);
 gboolean            bonobo_socket_disposed          (BonoboSocket       *socket);
+
+G_END_DECLS
 
 #endif /* _BONOBO_CONTROL_INTERNAL_H_ */
Index: bonobo/bonobo-ui-container.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-container.h,v
retrieving revision 1.19
diff -u -p -r1.19 bonobo-ui-container.h
--- bonobo/bonobo-ui-container.h	9 Nov 2001 08:54:29 -0000	1.19
+++ bonobo/bonobo-ui-container.h	1 Apr 2002 18:59:02 -0000
@@ -10,6 +10,8 @@
 #ifndef _BONOBO_UI_CONTAINER_H_
 #define _BONOBO_UI_CONTAINER_H_
 
+G_BEGIN_DECLS
+
 typedef struct _BonoboUIContainer BonoboUIContainer;
 
 #include <bonobo/bonobo-ui-engine.h>
@@ -40,5 +42,7 @@ BonoboUIContainer           *bonobo_ui_c
 void                         bonobo_ui_container_set_engine          (BonoboUIContainer  *container,
 								      BonoboUIEngine     *engine);
 BonoboUIEngine              *bonobo_ui_container_get_engine          (BonoboUIContainer  *container);
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_CONTAINER_H_ */
Index: bonobo/bonobo-ui-node-private.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-node-private.h,v
retrieving revision 1.3
diff -u -p -r1.3 bonobo-ui-node-private.h
--- bonobo/bonobo-ui-node-private.h	2 Feb 2002 18:54:18 -0000	1.3
+++ bonobo/bonobo-ui-node-private.h	1 Apr 2002 18:59:02 -0000
@@ -8,6 +8,8 @@
 
 #include <bonobo/bonobo-ui-node.h>
 
+G_BEGIN_DECLS
+
 struct _BonoboUINode {
 	/* Tree management */
 	BonoboUINode *parent;
@@ -45,5 +47,7 @@ void        bonobo_ui_node_add_after    
 void        bonobo_ui_node_move_children  (BonoboUINode *from,
 					   BonoboUINode *to);
 #define     bonobo_ui_node_same_name(a,b) ((a)->name_id == (b)->name_id)
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_NODE_PRIVATE_H_ */
Index: bonobo/bonobo-ui-node.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-node.h,v
retrieving revision 1.6
diff -u -p -r1.6 bonobo-ui-node.h
--- bonobo/bonobo-ui-node.h	4 Feb 2002 22:19:24 -0000	1.6
+++ bonobo/bonobo-ui-node.h	1 Apr 2002 18:59:02 -0000
@@ -12,6 +12,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _BonoboUINode BonoboUINode;
 
 BonoboUINode *bonobo_ui_node_new         (const char   *name);
@@ -61,5 +63,7 @@ char *        bonobo_ui_node_to_string  
 					  gboolean      recurse);
 BonoboUINode* bonobo_ui_node_from_string (const char *str);
 BonoboUINode* bonobo_ui_node_from_file   (const char *filename);
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_NODE_H_ */
Index: bonobo/bonobo-ui-private.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-private.h,v
retrieving revision 1.12
diff -u -p -r1.12 bonobo-ui-private.h
--- bonobo/bonobo-ui-private.h	26 Mar 2002 11:10:12 -0000	1.12
+++ bonobo/bonobo-ui-private.h	1 Apr 2002 18:59:02 -0000
@@ -18,6 +18,8 @@
 #include <bonobo/bonobo-ui-node-private.h>
 #include <bonobo/bonobo-ui-toolbar-control-item.h>
 
+G_BEGIN_DECLS
+
 /* To debug plug/socket/control render issues */
 #define noDEBUG_CONTROL
 
@@ -50,6 +52,8 @@ static inline void dprintf (const char *
 #define dprintf(format...) fprintf(stderr, format)
 
 #endif /* DEBUG_UI */
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_PRIVATE_H_ */
 
Index: bonobo/bonobo-ui-util.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-util.h,v
retrieving revision 1.26
diff -u -p -r1.26 bonobo-ui-util.h
--- bonobo/bonobo-ui-util.h	20 Dec 2001 16:15:32 -0000	1.26
+++ bonobo/bonobo-ui-util.h	1 Apr 2002 18:59:02 -0000
@@ -13,6 +13,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <bonobo/bonobo-ui-component.h>
 
+G_BEGIN_DECLS
+
 char      *bonobo_ui_util_pixbuf_to_xml       (GdkPixbuf         *pixbuf);
 GdkPixbuf *bonobo_ui_util_xml_to_pixbuf       (const char        *xml);
 
@@ -67,5 +69,7 @@ void            bonobo_ui_util_accel_par
 
 #define         bonobo_ui_util_decode_str(s,e) g_strdup (s)
 #define         bonobo_ui_util_encode_str(s)   g_strdup (s)
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_XML_UTIL_H_ */
Index: bonobo/bonobo-ui-xml.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-xml.h,v
retrieving revision 1.27
diff -u -p -r1.27 bonobo-ui-xml.h
--- bonobo/bonobo-ui-xml.h	8 Feb 2002 17:01:06 -0000	1.27
+++ bonobo/bonobo-ui-xml.h	1 Apr 2002 18:59:02 -0000
@@ -14,6 +14,8 @@
 #include <bonobo/bonobo-ui-node.h>
 #include <bonobo/bonobo-ui-engine.h>
 
+G_BEGIN_DECLS
+
 /* Internal API only */
 
 #ifdef BONOBO_UI_INTERNAL
@@ -128,5 +130,7 @@ void             bonobo_ui_xml_remove_wa
 						     gpointer      user_data);
 
 #endif /* BONOBO_UI_INTERNAL */
+
+G_END_DECLS
 
 #endif /* _BONOBO_UI_XML_H_ */
Index: bonobo/bonobo-window.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-window.h,v
retrieving revision 1.32
diff -u -p -r1.32 bonobo-window.h
--- bonobo/bonobo-window.h	9 Nov 2001 06:48:38 -0000	1.32
+++ bonobo/bonobo-window.h	1 Apr 2002 18:59:02 -0000
@@ -16,6 +16,8 @@
 #include <bonobo/bonobo-ui-engine.h>
 #include <bonobo/bonobo-ui-container.h>
 
+G_BEGIN_DECLS
+
 #define BONOBO_TYPE_WINDOW        (bonobo_window_get_type ())
 #define BONOBO_WINDOW(o)          (GTK_CHECK_CAST ((o), BONOBO_TYPE_WINDOW, BonoboWindow))
 #define BONOBO_WINDOW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BONOBO_TYPE_WINDOW, BonoboWindowClass))
@@ -69,5 +71,7 @@ void                 bonobo_window_add_p
  */
 void                 bonobo_window_remove_popup                   (BonoboWindow      *win,
 								   const char        *path);
+
+G_END_DECLS
 
 #endif /* _BONOBO_WINDOW_H_ */