diff options
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/Evolution-Shell.idl | 14 |
2 files changed, 24 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index a7f732deb9..10ddc92c27 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2005-12-22 Tor Lillqvist <tml@novell.com> + + * Evolution-Shell.idl: Guard against generating code when running + this through the IDL compiler elsewhere than here in evo/shell, + the same way as in Evolution-Component.idl. Otherwise we get + duplicated IDL-generated functions in the libeshell and + libevolution-mail DLLs (shared libraries), which causes much pain + on Win32 at least, and is useless and potentially risky on all + platforms. + 2005-09-24 Andre Klapper <a9016009@gmx.de>: Reviewed and committed by Harish <kharish@novell.com> diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl index c5999c9776..49875ea95a 100644 --- a/shell/Evolution-Shell.idl +++ b/shell/Evolution-Shell.idl @@ -13,6 +13,15 @@ #include <Bonobo.idl> +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +%{ +#pragma include_defs shell/evolution-component.h +%} +#pragma inhibit push +#endif +#endif + module GNOME { module Evolution { @@ -69,4 +78,9 @@ module Evolution { }; }; +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +#pragma inhibit pop +#endif #endif +#endif /* _GNOME_EVOLUTION_SHELL_IDL */ |