Re: one more stupid patch.

[Maciej Stachowiak <mjs eazel com>]

Mathieu Lacage <mathieu eazel com> writes:

> may I commit ?

You should also add the magic to suppress generation of real stubs and
skeletons in generated files (#pragma inhibit and all) so if you
include one of these IDL files directly you don't get linker problems.

 - Maciej
 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/bonobo/ChangeLog,v
> retrieving revision 1.749
> diff -u -r1.749 ChangeLog
> --- ChangeLog	2000/11/21 15:31:09	1.749
> +++ ChangeLog	2000/11/22 23:33:03
> @@ -1,3 +1,27 @@
> +2000-11-23  Mathieu Lacage  <mathieu eazel com>
> +
> +	Add necessary magic to make each of those file 
> +	compile separatly.
> +	* idl/bonobo-advise.idl:
> +	* idl/bonobo-canvas.idl:
> +	* idl/bonobo-client-site.idl:
> +	* idl/bonobo-control.idl:
> +	* idl/bonobo-desktop.idl:
> +	* idl/bonobo-embeddable.idl:
> +	* idl/bonobo-item-container.idl:
> +	* idl/bonobo-listener.idl:
> +	* idl/bonobo-moniker.idl:
> +	* idl/bonobo-persist.idl:
> +	* idl/bonobo-print.idl:
> +	* idl/bonobo-progressive.idl:
> +	* idl/bonobo-property.idl:
> +	* idl/bonobo-storage.idl:
> +	* idl/bonobo-ui.idl:
> +	* idl/bonobo-unknown.idl:
> +	* idl/bonobo-zoomable.idl:
> +	
> +	* idl/bonobo.idl: remove.
> +
>  2000-11-21  Michael Meeks  <michael helixcode com>
>  
>  	* doc/FAQ: update.
> Index: idl/bonobo-advise.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-advise.idl,v
> retrieving revision 1.5
> diff -u -r1.5 bonobo-advise.idl
> --- idl/bonobo-advise.idl	2000/10/09 17:52:04	1.5
> +++ idl/bonobo-advise.idl	2000/11/22 23:33:03
> @@ -7,6 +7,11 @@
>   *	Miguel de Icaza (miguel helixcode com)
>   */
>  
> +#ifndef BONOBO_ADVISE_IDL
> +#define BONOBO_ADVISE_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	interface AdviseSink : Bonobo::Unknown {
> @@ -30,3 +35,5 @@
>  		 */
>  	};
>  };
> +
> +#endif /* BONOBO_ADVISE_IDL */
> Index: idl/bonobo-canvas.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-canvas.idl,v
> retrieving revision 1.10
> diff -u -r1.10 bonobo-canvas.idl
> --- idl/bonobo-canvas.idl	2000/03/08 16:56:02	1.10
> +++ idl/bonobo-canvas.idl	2000/11/22 23:33:03
> @@ -7,6 +7,11 @@
>   * Copyright (C) 1999, 2000 Helix Code, Inc.
>   */
>  
> +#ifndef BONOBO_CANVAS_IDL
> +#define BONOBO_CANVAS_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  module Gdk {
> @@ -235,3 +240,4 @@
>  
>  };
>  
> +#endif /* BONOBO_CANVAS_IDL */
> Index: idl/bonobo-client-site.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-client-site.idl,v
> retrieving revision 1.12
> diff -u -r1.12 bonobo-client-site.idl
> --- idl/bonobo-client-site.idl	2000/10/09 17:52:04	1.12
> +++ idl/bonobo-client-site.idl	2000/11/22 23:33:03
> @@ -12,6 +12,13 @@
>   *    Miguel de Icaza (miguel gnu org)
>   */
>  
> +#ifndef BONOBO_CLIENT_SITE_IDL
> +#define BONOBO_CLIENT_SITE_IDL
> +
> +#include "bonobo-unknown.idl"
> +#include "bonobo-persist.idl"
> +#include "bonobo-item-container.idl"
> +
>  module Bonobo {
>  
>  interface ClientSite : Bonobo::Unknown {
> @@ -54,3 +61,7 @@
>  };
>  
>  };
> +
> +
> +#endif /* BONOBO_CLIENT_SITE_IDL */
> +
> Index: idl/bonobo-control.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-control.idl,v
> retrieving revision 1.19
> diff -u -r1.19 bonobo-control.idl
> --- idl/bonobo-control.idl	2000/10/09 17:52:04	1.19
> +++ idl/bonobo-control.idl	2000/11/22 23:33:03
> @@ -8,6 +8,12 @@
>   *   Miguel de Icaza <miguel gnu org>
>   */
>  
> +#ifndef BONOBO_CONTROL_IDL
> +#define BONOBO_CONTROL_IDL
> +
> +#include "bonobo-unknown.idl"
> +#include "bonobo-property.idl"
> +
>  module Bonobo {
>  
>  interface ControlFrame : Bonobo::Unknown {
> @@ -149,3 +155,5 @@
>  };
>  
>  };
> +
> +#endif
> Index: idl/bonobo-desktop.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-desktop.idl,v
> retrieving revision 1.3
> diff -u -r1.3 bonobo-desktop.idl
> --- idl/bonobo-desktop.idl	2000/10/09 17:52:04	1.3
> +++ idl/bonobo-desktop.idl	2000/11/22 23:33:03
> @@ -7,6 +7,11 @@
>   *   Miguel de Icaza (miguel kernel org)
>   */
>  
> +#ifndef BONOBO_DESKTOP_IDL
> +#define BONOBO_DESKTOP_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  module Desktop {
> @@ -29,3 +34,5 @@
>  };
>  
>  };
> +
> +#endif /* BONOBO_DESKTOP_IDL */
> Index: idl/bonobo-embeddable.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-embeddable.idl,v
> retrieving revision 1.31
> diff -u -r1.31 bonobo-embeddable.idl
> --- idl/bonobo-embeddable.idl	2000/10/09 17:52:04	1.31
> +++ idl/bonobo-embeddable.idl	2000/11/22 23:33:04
> @@ -13,6 +13,15 @@
>   *	Nat Friedman    (nat helixcode com)
>   */
>  
> +#ifndef BONOBO_EMBEDDABLE_IDL
> +#define BONOBO_EMBEDDABLE_IDL
> +
> +#include "bonobo-control.idl"
> +#include "bonobo-unknown.idl"
> +#include "bonobo-canvas.idl"
> +#include "bonobo-client-site.idl"
> +#include "bonobo-advise.idl"
> +
>  module Bonobo {
>  
>  interface View : Control {
> Index: idl/bonobo-item-container.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-item-container.idl,v
> retrieving revision 1.2
> diff -u -r1.2 bonobo-item-container.idl
> --- idl/bonobo-item-container.idl	2000/10/09 17:52:04	1.2
> +++ idl/bonobo-item-container.idl	2000/11/22 23:33:04
> @@ -7,6 +7,11 @@
>   *	Miguel de Icaza (miguel helixcode com)
>   */
>  
> +#ifndef BONOBO_ITEM_CONTAIER_IDL
> +#define BONOBO_ITEM_CONTAIER_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	interface ItemContainer : Unknown {
> @@ -45,3 +50,5 @@
>  			raises (SyntaxError, NotFound);
>  	};
>  };
> +
> +#endif /* BONOBO_ITEM_CONTAIER_IDL */
> Index: idl/bonobo-listener.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-listener.idl,v
> retrieving revision 1.6
> diff -u -r1.6 bonobo-listener.idl
> --- idl/bonobo-listener.idl	2000/10/09 17:52:04	1.6
> +++ idl/bonobo-listener.idl	2000/11/22 23:33:04
> @@ -7,6 +7,11 @@
>   *	Michael Meeks (michael helixcode com)
>   */
>  
> +#ifndef BONOBO_LISTENER_IDL
> +#define BONOBO_LISTENER_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	typedef sequence<any> ListenerArgs;
> @@ -44,5 +49,5 @@
>  			raises (UnknownListener);
>  	};
>  };
> -
>  
> +#endif /* BONOBO_LISTENER_IDL */
> Index: idl/bonobo-moniker.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-moniker.idl,v
> retrieving revision 1.8
> diff -u -r1.8 bonobo-moniker.idl
> --- idl/bonobo-moniker.idl	2000/08/11 21:55:58	1.8
> +++ idl/bonobo-moniker.idl	2000/11/22 23:33:04
> @@ -8,6 +8,11 @@
>   *	Ettore Perazzoli (ettore helixcode com)
>   */
>  
> +#ifndef BONOBO_MONIKER_IDL
> +#define BONOBO_MONIKER_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	typedef long ResolveFlag;
> @@ -64,3 +69,4 @@
>  	};
>  };
>  
> +#endif /* BONOBO_MONIKER_IDL */
> Index: idl/bonobo-persist.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-persist.idl,v
> retrieving revision 1.19
> diff -u -r1.19 bonobo-persist.idl
> --- idl/bonobo-persist.idl	2000/10/09 17:52:04	1.19
> +++ idl/bonobo-persist.idl	2000/11/22 23:33:04
> @@ -8,6 +8,12 @@
>   *    Dan Winship     (danw helixcode com)
>   */
>  
> +#ifndef BONOBO_PERSIST_IDL
> +#define BONOBO_PERSIST_IDL
> +
> +#include "bonobo-unknown.idl"
> +#include "bonobo-storage.idl"
> +
>  module Bonobo {
>  	exception NotSupported {};
>  
> @@ -178,3 +184,5 @@
>  	};
>  
>  };
> +
> +#endif /* BONOBO_PERSIST_IDL */
> Index: idl/bonobo-print.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-print.idl,v
> retrieving revision 1.4
> diff -u -r1.4 bonobo-print.idl
> --- idl/bonobo-print.idl	2000/10/09 17:52:04	1.4
> +++ idl/bonobo-print.idl	2000/11/22 23:33:04
> @@ -7,6 +7,11 @@
>   * Copyright (C) 2000 Helix Code, Inc.
>   */
>  
> +#ifndef BONOBO_PRINT_IDL
> +#define BONOBO_PRINT_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	typedef sequence<char> PrintData;
> @@ -35,3 +40,4 @@
>  	};
>  };
>  
> +#endif /* BONOBO_PRINT_IDL */
> Index: idl/bonobo-progressive.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-progressive.idl,v
> retrieving revision 1.6
> diff -u -r1.6 bonobo-progressive.idl
> --- idl/bonobo-progressive.idl	2000/10/09 17:52:04	1.6
> +++ idl/bonobo-progressive.idl	2000/11/22 23:33:04
> @@ -14,6 +14,11 @@
>   *
>   */
>  
> +#ifndef BONOBO_PROGRESSIVE_IDL
> +#define BONOBO_PROGRESSIVE_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	interface ProgressiveDataSink : Unknown {
> @@ -57,3 +62,5 @@
>  
>  	};
>  };
> +
> +#endif /* BONOBO_PROGRESSIVE_IDL */
> Index: idl/bonobo-property.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-property.idl,v
> retrieving revision 1.13
> diff -u -r1.13 bonobo-property.idl
> --- idl/bonobo-property.idl	2000/10/11 04:34:23	1.13
> +++ idl/bonobo-property.idl	2000/11/22 23:33:04
> @@ -14,6 +14,11 @@
>    * on suggestions from Chuck Jazdzewski <cjazdzewski inprise com>.
>    */
>  
> +#ifndef BONOBO_PROPERTY_IDL
> +#define BONOBO_PROPERTY_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  interface PropertyListener : Bonobo::Unknown {
> @@ -182,5 +187,5 @@
>  };
>  
>  };
> -
>  
> +#endif /* BONOBO_PROPERTY_IDL */
> Index: idl/bonobo-storage.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-storage.idl,v
> retrieving revision 1.21
> diff -u -r1.21 bonobo-storage.idl
> --- idl/bonobo-storage.idl	2000/10/30 18:27:49	1.21
> +++ idl/bonobo-storage.idl	2000/11/22 23:33:04
> @@ -16,6 +16,11 @@
>   *               Streams are equivalent to files.
>   */
>  
> +#ifndef BONOBO_STORAGE_IDL
> +#define BONOBO_STORAGE_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  	typedef long StorageInfoFields;
> @@ -254,5 +259,5 @@
>  
>  	};
>  };
> -
>  
> +#endif /* BONOBO_STORAGE_IDL */
> Index: idl/bonobo-ui.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-ui.idl,v
> retrieving revision 1.9
> diff -u -r1.9 bonobo-ui.idl
> --- idl/bonobo-ui.idl	2000/10/20 20:55:00	1.9
> +++ idl/bonobo-ui.idl	2000/11/22 23:33:04
> @@ -7,6 +7,11 @@
>   *	Michael Meeks (michael helixcode com)
>   */
>  
> +#ifndef BONOBO_UI_IDL
> +#define BONOBO_UI_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  	interface UIContainer;
>  
> @@ -80,3 +85,5 @@
>  			raises (InvalidPath);
>  	};
>  };
> +
> +#endif /* BONOBO_UI_IDL */
> Index: idl/bonobo-unknown.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-unknown.idl,v
> retrieving revision 1.3
> diff -u -r1.3 bonobo-unknown.idl
> --- idl/bonobo-unknown.idl	2000/10/09 17:52:04	1.3
> +++ idl/bonobo-unknown.idl	2000/11/22 23:33:04
> @@ -1,5 +1,3 @@
> -#ifndef __BONOBO_UNKNOWN_IDL__
> -#define __BONOBO_UNKNOWN_IDL__
>  /*
>   * bonobo-unknown.idl: The base Bonobo Object
>   *
> @@ -12,6 +10,9 @@
>   * Author:
>   *	Miguel de Icaza (miguel helixcode com)
>   */
> +
> +#ifndef __BONOBO_UNKNOWN_IDL__
> +#define __BONOBO_UNKNOWN_IDL__
>  
>  module Bonobo {
>  	interface Unknown {
> Index: idl/bonobo-zoomable.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo/idl/bonobo-zoomable.idl,v
> retrieving revision 1.5
> diff -u -r1.5 bonobo-zoomable.idl
> --- idl/bonobo-zoomable.idl	2000/10/19 09:01:39	1.5
> +++ idl/bonobo-zoomable.idl	2000/11/22 23:33:04
> @@ -22,6 +22,11 @@
>   *           Martin Baulig <baulig suse de>
>   */
>  
> +#ifndef BONOBO_ZOOMABLE_IDL
> +#define BONOBO_ZOOMABLE_IDL
> +
> +#include "bonobo-unknown.idl"
> +
>  module Bonobo {
>  
>  typedef float ZoomLevel;
> @@ -110,3 +115,5 @@
>  	void set_frame (in ZoomableFrame zoomable_frame);
>  };
>  };
> +
> +#endif /* BONOBO_ZOOMABLE_IDL */
> 
> -- 
> Mathieu Lacage <mathieu eazel com>
> 
> 
> _______________________________________________
> gnome-components-list mailing list
> gnome-components-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-components-list