Commit a96c73cb authored by Darin Adler's avatar Darin Adler
Browse files

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.
parent bf3b0282
2000-11-03 Darin Adler <darin@eazel.com>
* 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.
2000-11-03 Mathieu Lacage <mathieu@eazel.com>
Hopefully, fix bug 4055 for true.
......
......@@ -180,9 +180,9 @@ The following lists the packages and the versions that are required.
gnome-print: HEAD
control-center control-center-1-0
gnome-vfs: HEAD
bonobo: BONOBO_BEFORE_API_RENAME
bonobo: HEAD
ammonite HEAD
xpdf: BONOBO_BEFORE_API_RENAME
xpdf: HEAD
medusa: HEAD
nautilus: HEAD
......
......@@ -120,8 +120,8 @@ nautilus_adapter_embed_strategy_get (Bonobo_Unknown component)
CORBA_exception_init (&ev);
control = Bonobo_Unknown_query_interface (component,
"IDL:Bonobo/Control:1.0", &ev);
control = Bonobo_Unknown_queryInterface (component,
"IDL:Bonobo/Control:1.0", &ev);
if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (control, &ev)) {
......@@ -130,8 +130,8 @@ nautilus_adapter_embed_strategy_get (Bonobo_Unknown component)
return nautilus_adapter_control_embed_strategy_new (control, CORBA_OBJECT_NIL);
}
embeddable = Bonobo_Unknown_query_interface (component,
"IDL:Bonobo/Embeddable:1.0", &ev);
embeddable = Bonobo_Unknown_queryInterface (component,
"IDL:Bonobo/Embeddable:1.0", &ev);
if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (embeddable, &ev)) {
CORBA_exception_free (&ev);
......
......@@ -136,8 +136,8 @@ nautilus_adapter_load_strategy_get (Bonobo_Unknown component)
CORBA_exception_init (&ev);
progressive_data_sink = Bonobo_Unknown_query_interface (component,
"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
progressive_data_sink = Bonobo_Unknown_queryInterface (component,
"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (progressive_data_sink, &ev)) {
......@@ -147,8 +147,8 @@ nautilus_adapter_load_strategy_get (Bonobo_Unknown component)
}
persist_stream = Bonobo_Unknown_query_interface (component,
"IDL:Bonobo/PersistStream:1.0", &ev);
persist_stream = Bonobo_Unknown_queryInterface (component,
"IDL:Bonobo/PersistStream:1.0", &ev);
if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (persist_stream, &ev)) {
CORBA_exception_free (&ev);
......@@ -157,10 +157,9 @@ nautilus_adapter_load_strategy_get (Bonobo_Unknown component)
}
persist_file = Bonobo_Unknown_query_interface (component,
"IDL:Bonobo/PersistFile:1.0", &ev);
persist_file = Bonobo_Unknown_queryInterface (component,
"IDL:Bonobo/PersistFile:1.0", &ev);
if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (persist_file, &ev)) {
CORBA_exception_free (&ev);
......
......@@ -208,7 +208,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
gnome_vfs_file_info_clear (&file_info);
if (result == GNOME_VFS_OK && file_info.valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink,
Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink,
(long) file_info.size, &ev);
CHECK_IF_STOPPED;
}
......@@ -219,7 +219,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (result == GNOME_VFS_OK) {
iobuf->_length = bytes_read;
Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev);
Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
CHECK_IF_STOPPED;
......
......@@ -69,7 +69,7 @@ history_view_frame_call_begin (NautilusView *view, CORBA_Environment *ev)
g_return_val_if_fail (NAUTILUS_IS_VIEW (view), CORBA_OBJECT_NIL);
CORBA_exception_init (ev);
return Bonobo_Unknown_query_interface
return Bonobo_Unknown_queryInterface
(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
"IDL:Nautilus/HistoryFrame:1.0", ev);
}
......
/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
#include <Bonobo.idl>
module Trilobite {
......
/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
#include <Bonobo.idl>
module Trilobite {
......
#ifndef __TRILOBITE_IDL__
#define __TRILOBITE_IDL__
/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
#ifndef TRILOBITE_SERVICE_IDL
#define TRILOBITE_SERVICE_IDL
#include <Bonobo.idl>
......
/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
#include <Bonobo.idl>
module Trilobite {
......
......@@ -443,7 +443,29 @@ AC_MSG_ERROR([
*** Gtk+ 1.2.0 or better is required. The latest version of GTK
*** is always available from ftp://ftp.gtk.org/.]))
AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl )
AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl)
dnl
dnl We need the right version of bonobo because
dnl the IDLs have changed.
dnl
AC_MSG_CHECKING(for Bonobo >= 0.27)
if gnome-config --libs bonobox > /dev/null 2>&1; then
vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
if test "$vers" -ge 27; then
bonobo_ok=true
else
bonobo_ok=false
fi
else
bonobo_ok=false
fi
if $bonobo_ok; then
AC_MSG_RESULT($vers found)
else
AC_MSG_ERROR(Bonobo 0.27 or newer is required to compile Nautilus)
fi
AC_SUBST(GNOMECANVASPIXBUF_LIBS)
AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR)
......
......@@ -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 */
......@@ -22,8 +22,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef NAUTUILUS_UNDO_IDL_INCLUDED
#define NAUTUILUS_UNDO_IDL_INCLUDED
#ifndef NAUTILUS_UNDO_IDL_INCLUDED
#define NAUTILUS_UNDO_IDL_INCLUDED
#include <Bonobo.idl>
......@@ -100,4 +100,4 @@ module Nautilus {
};
};
#endif /* NAUTUILUS_UNDO_IDL_INCLUDED */
#endif /* NAUTILUS_UNDO_IDL_INCLUDED */
......@@ -255,7 +255,7 @@ set_up_bonobo_control (BonoboControl *control)
/* Find the undo manager. */
control_frame = bonobo_control_get_control_frame (control);
if (!CORBA_Object_is_nil (control_frame, &ev)) {
undo_context = Bonobo_Control_query_interface
undo_context = Bonobo_Control_queryInterface
(control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
if (!CORBA_Object_is_nil (undo_context, &ev)) {
manager = Nautilus_Undo_Context__get_undo_manager (undo_context, &ev);
......
......@@ -10,7 +10,6 @@
#pragma inhibit push
#endif
#include <Bonobo.idl>
/* FIXME bugzilla.eazel.com 2974: Use of doubles causes alignment
......
......@@ -312,7 +312,7 @@ view_frame_call_begin (NautilusView *view, CORBA_Environment *ev)
CORBA_exception_init (ev);
view_frame = Bonobo_Unknown_query_interface
view_frame = Bonobo_Unknown_queryInterface
(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
"IDL:Nautilus/ViewFrame:1.0", ev);
......
......@@ -538,7 +538,7 @@ nautilus_zoomable_ensure_zoomable_frame (NautilusZoomable *view)
CORBA_exception_init (&ev);
if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) {
view->details->zoomable_frame = Bonobo_Unknown_query_interface
view->details->zoomable_frame = Bonobo_Unknown_queryInterface
(bonobo_control_get_control_frame
(BONOBO_CONTROL (nautilus_zoomable_get_bonobo_control (view))),
"IDL:Nautilus/ZoomableFrame:1.0", &ev);
......
......@@ -164,7 +164,7 @@ realize (GtkWidget *widget)
window = NAUTILUS_DESKTOP_WINDOW (widget);
/* Hide unused pieces of the BonoboWin.
/* Hide unused pieces of the BonoboWindow.
* We don't want a menu bar, toolbars, or status bar on the desktop.
* But we don't want to hide the client area!
*/
......
......@@ -125,7 +125,7 @@ static void nautilus_window_real_load_content_view_menu (NautilusFile *file,
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
nautilus_window,
BONOBO_TYPE_WIN)
BONOBO_TYPE_WINDOW)
static void
nautilus_window_initialize_class (NautilusWindowClass *klass)
......@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
/* CORBA and Bonobo setup, which must be done before the location bar setup */
window->details->ui_container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (window->details->ui_container,
BONOBO_WIN (window));
BONOBO_WINDOW(window));
/* Load the user interface from the XML file. */
window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
......@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
}
gtk_widget_show (window->content_hbox);
bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
/* set up the index panel */
......@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
if (GTK_VALUE_STRING (*arg) == NULL) {
return;
}
old_name = bonobo_win_get_name (BONOBO_WIN (object));
bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
/* This hack of using the time when the name first
* goes non-NULL to be window-constructed time is
* completely lame. But it works, so for now we leave
......@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
{
switch(arg_id) {
case ARG_APP_ID:
GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
break;
case ARG_APP:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
......@@ -1420,7 +1420,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
}
/* Here's an explicit check for a problem that happens all too often. */
if (bonobo_win_xml_node_exists (BONOBO_WIN (window),
if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
"/menu/File/Open Placeholder/Open")) {
g_warning ("There's a lingering Open menu item. "
"This usually means a new Bonobo bug.");
......
......@@ -49,7 +49,7 @@ typedef struct NautilusWindow NautilusWindow;
#endif
typedef struct {
BonoboWinClass parent_spot;
BonoboWindowClass parent_spot;
} NautilusWindowClass;
typedef struct NautilusWindowStateInfo NautilusWindowStateInfo;
......@@ -64,7 +64,7 @@ typedef enum {
typedef struct NautilusWindowDetails NautilusWindowDetails;
struct NautilusWindow {
BonoboWin parent_object;
BonoboWindow parent_object;
NautilusWindowDetails *details;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment