diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-11-04 00:48:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-11-04 00:48:52 +0000 |
| commit | a96c73cb262f2a722ac9c8417a56d8dc1c2b3d90 (patch) | |
| tree | ba8632cbe46a7d7da48a9e0c985d3b4c5f40e9b7 /libnautilus-adapter | |
| parent | bf3b0282f3ddc84b2fe617ea7074d60ef8df8ff1 (diff) | |
| download | nautilus-a96c73cb262f2a722ac9c8417a56d8dc1c2b3d90.tar.gz | |
Tell everyone that we are back on bonobo HEAD. Make sure Nautilus doesn't
* README: Tell everyone that we are back on bonobo HEAD.
* configure.in: Make sure Nautilus doesn't try to compile with the
old bonobo.
* components/adapter/nautilus-adapter-embed-strategy.c:
(nautilus_adapter_embed_strategy_get):
* components/adapter/nautilus-adapter-load-strategy.c:
(nautilus_adapter_load_strategy_get):
* components/adapter/nautilus-adapter-progressive-load-strategy.c:
(nautilus_adapter_progressive_load_strategy_load_location):
* components/history/nautilus-history-view.c:
(history_view_frame_call_begin):
* libnautilus/nautilus-undo.c: (set_up_bonobo_control):
* libnautilus/nautilus-view.c: (view_frame_call_begin):
* libnautilus/nautilus-zoomable.c:
(nautilus_zoomable_ensure_zoomable_frame):
Fix all the callers of query_interface in CORBA to call it
queryInterface (I used the Bonobo script to do it).
* src/nautilus-window.h:
* src/nautilus-window.c: (nautilus_window_constructed),
(nautilus_window_set_arg), (nautilus_window_get_arg),
(nautilus_window_set_content_view_widget): Update for BonoboWin ->
BonoboWindow change. Once again, the change was done by the Bonobo
script (but I had to undo the spaces it ate after BONOBO_WIN).
* components/services/install/idl/trilobite-eazel-install.idl:
* components/services/time/idl/trilobite-eazel-time-service.idl:
* components/services/trilobite/idl/trilobite-service.idl:
* components/services/trilobite/sample/idl/sample-service.idl:
* libnautilus-adapter/nautilus-adapter-factory.idl:
* libnautilus/nautilus-distributed-undo.idl:
* libnautilus/nautilus-view-component.idl:
Since IDL dependencies don't work, I touched every IDL file to
make the switchover smoother. This only works if people update
before they try to build and fail, otherwise they need to do:
find -name '*.xml' | xargs touch
(Maciej and I want to add dependency support to orbit-idl to make
this problem go away long term).
* src/nautilus-desktop-window.c: (realize):
The script updated this comment to, so I let it.
* user-guide/C/Makefile.am: Took out the botched change I made to
this file. Mathieu did the correct one.
Diffstat (limited to 'libnautilus-adapter')
| -rw-r--r-- | libnautilus-adapter/nautilus-adapter-factory.idl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnautilus-adapter/nautilus-adapter-factory.idl b/libnautilus-adapter/nautilus-adapter-factory.idl index 9262a5f85..5d156202e 100644 --- a/libnautilus-adapter/nautilus-adapter-factory.idl +++ b/libnautilus-adapter/nautilus-adapter-factory.idl @@ -26,8 +26,8 @@ * that are not Nautilus::Views as Nautilus::View objects. */ -#ifndef NAUTUILUS_ADAPTER_FACTORY_IDL_INCLUDED -#define NAUTUILUS_ADAPTER_FACTORY_IDL_INCLUDED +#ifndef NAUTUILUS_ADAPTER_FACTORY_IDL +#define NAUTUILUS_ADAPTER_FACTORY_IDL #include <Bonobo.idl> #include <libnautilus/nautilus-view-component.idl> @@ -41,4 +41,4 @@ module Nautilus { }; -#endif /* NAUTUILUS_ADAPTER_FACTORY_IDL_INCLUDED */ +#endif /* NAUTUILUS_ADAPTER_FACTORY_IDL */ |