[packages/nautilus.git] / nautilus-bonobo.patch

diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c
--- nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c	Mon Oct 23 16:36:53 2000
+++ nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c	Sun Nov 19 20:11:50 2000
@@ -120,7 +120,7 @@
 
 	CORBA_exception_init (&ev);
 
-	control = Bonobo_Unknown_query_interface (component,
+	control = Bonobo_Unknown_queryInterface (component,
 						  "IDL:Bonobo/Control:1.0", &ev);
 	
 
@@ -130,7 +130,7 @@
 		return nautilus_adapter_control_embed_strategy_new (control, CORBA_OBJECT_NIL);
 	}
 
-	embeddable = Bonobo_Unknown_query_interface (component,
+	embeddable = Bonobo_Unknown_queryInterface (component,
 						     "IDL:Bonobo/Embeddable:1.0", &ev);
 	
 	if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (embeddable, &ev)) {
diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c
--- nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c	Tue Oct  3 06:12:50 2000
+++ nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c	Sun Nov 19 20:11:50 2000
@@ -136,7 +136,7 @@
 
 	CORBA_exception_init (&ev);
 
-	progressive_data_sink = Bonobo_Unknown_query_interface (component,
+	progressive_data_sink = Bonobo_Unknown_queryInterface (component,
 								"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
 	
 
@@ -147,7 +147,7 @@
 	}
 
 
-	persist_stream = Bonobo_Unknown_query_interface (component,
+	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)) {
@@ -157,7 +157,7 @@
 	}
 
 
-	persist_file = Bonobo_Unknown_query_interface (component,
+	persist_file = Bonobo_Unknown_queryInterface (component,
 						       "IDL:Bonobo/PersistFile:1.0", &ev);
 	
 
diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c
--- nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c	Fri Oct 20 10:45:48 2000
+++ nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c	Sun Nov 19 20:11:50 2000
@@ -208,7 +208,7 @@
 	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 @@
 		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;
 			
diff -Nur nautilus-0.5/components/history/nautilus-history-view.c nautilus-0.5.new/components/history/nautilus-history-view.c
--- nautilus-0.5/components/history/nautilus-history-view.c	Fri Oct  6 01:47:34 2000
+++ nautilus-0.5.new/components/history/nautilus-history-view.c	Sun Nov 19 20:12:44 2000
@@ -69,7 +69,7 @@
 	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);
 }
diff -Nur nautilus-0.5/libnautilus/nautilus-distributed-undo.h nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h
--- nautilus-0.5/libnautilus/nautilus-distributed-undo.h	Tue Nov  7 15:30:22 2000
+++ nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h	Sun Nov 19 20:11:50 2000
@@ -260,7 +260,7 @@
 /** prototypes **/
 #define Nautilus_Undo_Transaction_ref Bonobo_Unknown_ref
 #define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref
-#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface
    Nautilus_Undo_MenuItem
       *Nautilus_Undo_Transaction__get_undo_menu_item(Nautilus_Undo_Transaction
 						     _obj,
@@ -277,7 +277,7 @@
 				       CORBA_Environment * ev);
 #define Nautilus_Undo_Manager_ref Bonobo_Unknown_ref
 #define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref
-#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface
    void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj,
 				     const Nautilus_Undo_Transaction
 				     transaction, CORBA_Environment * ev);
@@ -288,7 +288,7 @@
 				   CORBA_Environment * ev);
 #define Nautilus_Undo_Context_ref Bonobo_Unknown_ref
 #define Nautilus_Undo_Context_unref Bonobo_Unknown_unref
-#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface
    Nautilus_Undo_Manager
       Nautilus_Undo_Context__get_undo_manager(Nautilus_Undo_Context _obj,
 					      CORBA_Environment * ev);
diff -Nur nautilus-0.5/libnautilus/nautilus-undo.c nautilus-0.5.new/libnautilus/nautilus-undo.c
--- nautilus-0.5/libnautilus/nautilus-undo.c	Fri Oct  6 01:47:43 2000
+++ nautilus-0.5.new/libnautilus/nautilus-undo.c	Sun Nov 19 20:11:50 2000
@@ -255,7 +255,7 @@
 	/* 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);
diff -Nur nautilus-0.5/libnautilus/nautilus-view-component.h nautilus-0.5.new/libnautilus/nautilus-view-component.h
--- nautilus-0.5/libnautilus/nautilus-view-component.h	Tue Nov  7 15:30:21 2000
+++ nautilus-0.5.new/libnautilus/nautilus-view-component.h	Sun Nov 19 20:11:51 2000
@@ -781,7 +781,7 @@
 /** prototypes **/
 #define Nautilus_View_ref Bonobo_Unknown_ref
 #define Nautilus_View_unref Bonobo_Unknown_unref
-#define Nautilus_View_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface
    void Nautilus_View_load_location(Nautilus_View _obj,
 				    const Nautilus_URI location,
 				    CORBA_Environment * ev);
@@ -795,7 +795,7 @@
 				    CORBA_Environment * ev);
 #define Nautilus_ViewFrame_ref Bonobo_Unknown_ref
 #define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
-#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface
    void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj,
 					 const Nautilus_URI location,
 					 CORBA_Environment * ev);
@@ -829,7 +829,7 @@
 				     CORBA_Environment * ev);
 #define Nautilus_Zoomable_ref Bonobo_Unknown_ref
 #define Nautilus_Zoomable_unref Bonobo_Unknown_unref
-#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface
    CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj,
 						 CORBA_Environment * ev);
    void Nautilus_Zoomable__set_zoom_level(Nautilus_Zoomable _obj,
@@ -852,7 +852,7 @@
 				      CORBA_Environment * ev);
 #define Nautilus_ZoomableFrame_ref Bonobo_Unknown_ref
 #define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref
-#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface
    void
       Nautilus_ZoomableFrame_report_zoom_level_changed(Nautilus_ZoomableFrame
 						       _obj,
@@ -862,7 +862,7 @@
 						       ev);
 #define Nautilus_HistoryFrame_ref Bonobo_Unknown_ref
 #define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref
-#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface
+#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface
    Nautilus_HistoryList
       *Nautilus_HistoryFrame_get_history_list(Nautilus_HistoryFrame _obj,
 					      CORBA_Environment * ev);
diff -Nur nautilus-0.5/libnautilus/nautilus-view.c nautilus-0.5.new/libnautilus/nautilus-view.c
--- nautilus-0.5/libnautilus/nautilus-view.c	Fri Oct  6 01:47:43 2000
+++ nautilus-0.5.new/libnautilus/nautilus-view.c	Sun Nov 19 20:11:51 2000
@@ -312,7 +312,7 @@
 	
 	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);
 
diff -Nur nautilus-0.5/libnautilus/nautilus-zoomable.c nautilus-0.5.new/libnautilus/nautilus-zoomable.c
--- nautilus-0.5/libnautilus/nautilus-zoomable.c	Thu Sep 14 19:10:16 2000
+++ nautilus-0.5.new/libnautilus/nautilus-zoomable.c	Sun Nov 19 20:11:51 2000
@@ -538,7 +538,7 @@
 	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);
diff -Nur nautilus-0.5/src/nautilus-window.c nautilus-0.5.new/src/nautilus-window.c
--- nautilus-0.5/src/nautilus-window.c	Mon Nov  6 14:41:55 2000
+++ nautilus-0.5.new/src/nautilus-window.c	Sun Nov 19 20:11:51 2000
@@ -125,7 +125,7 @@
 
 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 @@
 	/* 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 @@
 		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 @@
 		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 @@
 {
 	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);
diff -Nur nautilus-0.5/src/nautilus-window.h nautilus-0.5.new/src/nautilus-window.h
--- nautilus-0.5/src/nautilus-window.h	Sat Oct  7 02:34:52 2000
+++ nautilus-0.5.new/src/nautilus-window.h	Sun Nov 19 20:11:51 2000
@@ -49,7 +49,7 @@
 #endif
 
 typedef struct {
-        BonoboWinClass parent_spot;
+        BonoboWindowClass parent_spot;
 } NautilusWindowClass;
 
 typedef struct NautilusWindowStateInfo NautilusWindowStateInfo;
@@ -64,7 +64,7 @@
 typedef struct NautilusWindowDetails NautilusWindowDetails;
 
 struct NautilusWindow {
-        BonoboWin parent_object;
+        BonoboWindow parent_object;
         
         NautilusWindowDetails *details;
Commit	Line	Data
0610d351	1	diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c
	2	--- nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c Mon Oct 23 16:36:53 2000
	3	+++ nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c Sun Nov 19 20:11:50 2000
	4	@@ -120,7 +120,7 @@
	5
	6	CORBA_exception_init (&ev);
	7
	8	- control = Bonobo_Unknown_query_interface (component,
	9	+ control = Bonobo_Unknown_queryInterface (component,
	10	"IDL:Bonobo/Control:1.0", &ev);
	11
	12
	13	@@ -130,7 +130,7 @@
	14	return nautilus_adapter_control_embed_strategy_new (control, CORBA_OBJECT_NIL);
	15	}
	16
	17	- embeddable = Bonobo_Unknown_query_interface (component,
	18	+ embeddable = Bonobo_Unknown_queryInterface (component,
	19	"IDL:Bonobo/Embeddable:1.0", &ev);
	20
	21	if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (embeddable, &ev)) {
	22	diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c
	23	--- nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c Tue Oct 3 06:12:50 2000
	24	+++ nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c Sun Nov 19 20:11:50 2000
	25	@@ -136,7 +136,7 @@
	26
	27	CORBA_exception_init (&ev);
	28
	29	- progressive_data_sink = Bonobo_Unknown_query_interface (component,
	30	+ progressive_data_sink = Bonobo_Unknown_queryInterface (component,
	31	"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
	32
	33
	34	@@ -147,7 +147,7 @@
	35	}
	36
	37
	38	- persist_stream = Bonobo_Unknown_query_interface (component,
	39	+ persist_stream = Bonobo_Unknown_queryInterface (component,
	40	"IDL:Bonobo/PersistStream:1.0", &ev);
	41
	42	if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (persist_stream, &ev)) {
	43	@@ -157,7 +157,7 @@
	44	}
	45
	46
	47	- persist_file = Bonobo_Unknown_query_interface (component,
	48	+ persist_file = Bonobo_Unknown_queryInterface (component,
	49	"IDL:Bonobo/PersistFile:1.0", &ev);
	50
	51
	52	diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c
	53	--- nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c Fri Oct 20 10:45:48 2000
	54	+++ nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c Sun Nov 19 20:11:50 2000
	55	@@ -208,7 +208,7 @@
	56	gnome_vfs_file_info_clear (&file_info);
	57
	58	if (result == GNOME_VFS_OK && file_info.valid_fields \| GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
	59	- Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink,
	60	+ Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink,
	61	(long) file_info.size, &ev);
	62	CHECK_IF_STOPPED;
	63	}
	64	@@ -219,7 +219,7 @@
65	if (result == GNOME_VFS_OK) {
66	iobuf->_length = bytes_read;
67
68	- Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev);
69	+ Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
70
71	CHECK_IF_STOPPED;
72
73	diff -Nur nautilus-0.5/components/history/nautilus-history-view.c nautilus-0.5.new/components/history/nautilus-history-view.c
74	--- nautilus-0.5/components/history/nautilus-history-view.c Fri Oct 6 01:47:34 2000
75	+++ nautilus-0.5.new/components/history/nautilus-history-view.c Sun Nov 19 20:12:44 2000
76	@@ -69,7 +69,7 @@
77	g_return_val_if_fail (NAUTILUS_IS_VIEW (view), CORBA_OBJECT_NIL);
78
79	CORBA_exception_init (ev);
80	- return Bonobo_Unknown_query_interface
81	+ return Bonobo_Unknown_queryInterface
82	(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
83	"IDL:Nautilus/HistoryFrame:1.0", ev);
84	}
85	diff -Nur nautilus-0.5/libnautilus/nautilus-distributed-undo.h nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h
86	--- nautilus-0.5/libnautilus/nautilus-distributed-undo.h Tue Nov 7 15:30:22 2000
87	+++ nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h Sun Nov 19 20:11:50 2000
88	@@ -260,7 +260,7 @@
89	/ prototypes /
90	#define Nautilus_Undo_Transaction_ref Bonobo_Unknown_ref
91	#define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref
92	-#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface
93	+#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface
94	Nautilus_Undo_MenuItem
95	*Nautilus_Undo_Transaction__get_undo_menu_item(Nautilus_Undo_Transaction
96	_obj,
97	@@ -277,7 +277,7 @@
98	CORBA_Environment * ev);
99	#define Nautilus_Undo_Manager_ref Bonobo_Unknown_ref
100	#define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref
101	-#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface
102	+#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface
103	void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj,
104	const Nautilus_Undo_Transaction
105	transaction, CORBA_Environment * ev);
106	@@ -288,7 +288,7 @@
107	CORBA_Environment * ev);
108	#define Nautilus_Undo_Context_ref Bonobo_Unknown_ref
109	#define Nautilus_Undo_Context_unref Bonobo_Unknown_unref
110	-#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface
111	+#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface
112	Nautilus_Undo_Manager
113	Nautilus_Undo_Context__get_undo_manager(Nautilus_Undo_Context _obj,
114	CORBA_Environment * ev);
115	diff -Nur nautilus-0.5/libnautilus/nautilus-undo.c nautilus-0.5.new/libnautilus/nautilus-undo.c
116	--- nautilus-0.5/libnautilus/nautilus-undo.c Fri Oct 6 01:47:43 2000
117	+++ nautilus-0.5.new/libnautilus/nautilus-undo.c Sun Nov 19 20:11:50 2000
118	@@ -255,7 +255,7 @@
119	/* Find the undo manager. */
120	control_frame = bonobo_control_get_control_frame (control);
121	if (!CORBA_Object_is_nil (control_frame, &ev)) {
122	- undo_context = Bonobo_Control_query_interface
123	+ undo_context = Bonobo_Control_queryInterface
124	(control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
125	if (!CORBA_Object_is_nil (undo_context, &ev)) {
126	manager = Nautilus_Undo_Context__get_undo_manager (undo_context, &ev);
127	diff -Nur nautilus-0.5/libnautilus/nautilus-view-component.h nautilus-0.5.new/libnautilus/nautilus-view-component.h
128	--- nautilus-0.5/libnautilus/nautilus-view-component.h Tue Nov 7 15:30:21 2000
129	+++ nautilus-0.5.new/libnautilus/nautilus-view-component.h Sun Nov 19 20:11:51 2000
130	@@ -781,7 +781,7 @@
131	/ prototypes /
132	#define Nautilus_View_ref Bonobo_Unknown_ref
133	#define Nautilus_View_unref Bonobo_Unknown_unref
134	-#define Nautilus_View_query_interface Bonobo_Unknown_query_interface
135	+#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface
136	void Nautilus_View_load_location(Nautilus_View _obj,
137	const Nautilus_URI location,
138	CORBA_Environment * ev);
139	@@ -795,7 +795,7 @@
140	CORBA_Environment * ev);
141	#define Nautilus_ViewFrame_ref Bonobo_Unknown_ref
142	#define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
143	-#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface
144	+#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface
145	void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj,
146	const Nautilus_URI location,
147	CORBA_Environment * ev);
148	@@ -829,7 +829,7 @@
149	CORBA_Environment * ev);
150	#define Nautilus_Zoomable_ref Bonobo_Unknown_ref
151	#define Nautilus_Zoomable_unref Bonobo_Unknown_unref
152	-#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface
153	+#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface
154	CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj,
155	CORBA_Environment * ev);
156	void Nautilus_Zoomable__set_zoom_level(Nautilus_Zoomable _obj,
157	@@ -852,7 +852,7 @@
158	CORBA_Environment * ev);
159	#define Nautilus_ZoomableFrame_ref Bonobo_Unknown_ref
160	#define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref
161	-#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface
162	+#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface
163	void
164	Nautilus_ZoomableFrame_report_zoom_level_changed(Nautilus_ZoomableFrame
165	_obj,
166	@@ -862,7 +862,7 @@
167	ev);
168	#define Nautilus_HistoryFrame_ref Bonobo_Unknown_ref
169	#define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref
170	-#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface
171	+#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface
172	Nautilus_HistoryList
173	*Nautilus_HistoryFrame_get_history_list(Nautilus_HistoryFrame _obj,
174	CORBA_Environment * ev);
175	diff -Nur nautilus-0.5/libnautilus/nautilus-view.c nautilus-0.5.new/libnautilus/nautilus-view.c
176	--- nautilus-0.5/libnautilus/nautilus-view.c Fri Oct 6 01:47:43 2000
177	+++ nautilus-0.5.new/libnautilus/nautilus-view.c Sun Nov 19 20:11:51 2000
178	@@ -312,7 +312,7 @@
179
180	CORBA_exception_init (ev);
181
182	- view_frame = Bonobo_Unknown_query_interface
183	+ view_frame = Bonobo_Unknown_queryInterface
184	(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
185	"IDL:Nautilus/ViewFrame:1.0", ev);
186
187	diff -Nur nautilus-0.5/libnautilus/nautilus-zoomable.c nautilus-0.5.new/libnautilus/nautilus-zoomable.c
188	--- nautilus-0.5/libnautilus/nautilus-zoomable.c Thu Sep 14 19:10:16 2000
189	+++ nautilus-0.5.new/libnautilus/nautilus-zoomable.c Sun Nov 19 20:11:51 2000
190	@@ -538,7 +538,7 @@
191	CORBA_exception_init (&ev);
192
193	if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) {
194	- view->details->zoomable_frame = Bonobo_Unknown_query_interface
195	+ view->details->zoomable_frame = Bonobo_Unknown_queryInterface
196	(bonobo_control_get_control_frame
197	(BONOBO_CONTROL (nautilus_zoomable_get_bonobo_control (view))),
198	"IDL:Nautilus/ZoomableFrame:1.0", &ev);
199	diff -Nur nautilus-0.5/src/nautilus-window.c nautilus-0.5.new/src/nautilus-window.c
200	--- nautilus-0.5/src/nautilus-window.c Mon Nov 6 14:41:55 2000
201	+++ nautilus-0.5.new/src/nautilus-window.c Sun Nov 19 20:11:51 2000
202	@@ -125,7 +125,7 @@
203
204	NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
205	nautilus_window,
206	- BONOBO_TYPE_WIN)
207	+ BONOBO_TYPE_WINDOW)
208
209	static void
210	nautilus_window_initialize_class (NautilusWindowClass *klass)
211	@@ -341,7 +341,7 @@
212	/* CORBA and Bonobo setup, which must be done before the location bar setup */
213	window->details->ui_container = bonobo_ui_container_new ();
214	bonobo_ui_container_set_win (window->details->ui_container,
215	- BONOBO_WIN (window));
216	+ BONOBO_WINDOW (window));
217
218	/* Load the user interface from the XML file. */
219	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
220	@@ -420,7 +420,7 @@
221	e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
222	}
223	gtk_widget_show (window->content_hbox);
224	- bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
225	+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
226
227	/* set up the index panel */
228
229	@@ -496,8 +496,8 @@
230	if (GTK_VALUE_STRING (*arg) == NULL) {
231	return;
232	}
233	- old_name = bonobo_win_get_name (BONOBO_WIN (object));
234	- bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
235	+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
236	+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
237	/* This hack of using the time when the name first
238	* goes non-NULL to be window-constructed time is
239	* completely lame. But it works, so for now we leave
240	@@ -521,7 +521,7 @@
241	{
242	switch(arg_id) {
243	case ARG_APP_ID:
244	- GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
245	+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
246	break;
247	case ARG_APP:
248	GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
249	diff -Nur nautilus-0.5/src/nautilus-window.h nautilus-0.5.new/src/nautilus-window.h
250	--- nautilus-0.5/src/nautilus-window.h Sat Oct 7 02:34:52 2000
251	+++ nautilus-0.5.new/src/nautilus-window.h Sun Nov 19 20:11:51 2000
252	@@ -49,7 +49,7 @@
253	#endif
254
255	typedef struct {
256	- BonoboWinClass parent_spot;
257	+ BonoboWindowClass parent_spot;
258	} NautilusWindowClass;
259
260	typedef struct NautilusWindowStateInfo NautilusWindowStateInfo;
261	@@ -64,7 +64,7 @@
262	typedef struct NautilusWindowDetails NautilusWindowDetails;
263
264	struct NautilusWindow {
265	- BonoboWin parent_object;
266	+ BonoboWindow parent_object;
267
268	NautilusWindowDetails *details;
269