The big api rename ...

2000-11-02  Michael Meeks <michael@helixcode.com>

	* The big api rename ...

svn path=/trunk/; revision=6346

5 files changed, 13 insertions, 13 deletions

diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 37cb1909ab..e2906b2fbf 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -370,7 +370,7 @@ static void
 command_xml_dump (gpointer    dummy,
 		  EShellView *view)
 {
-	bonobo_win_dump (BONOBO_WIN (view), "On demand");
+	bonobo_window_dump (BONOBO_WINDOW (view), "On demand");
 }
 
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 45f4fa0ef7..f3ce68ad07 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -56,7 +56,7 @@
 #include <gal/e-paned/e-hpaned.h>
 
 
-static BonoboWinClass *parent_class = NULL;
+static BonoboWindowClass *parent_class = NULL;
 
 struct _EShellViewPrivate {
 	/* The shell.  */
@@ -508,7 +508,7 @@ setup_widgets (EShellView *shell_view)
 	e_paned_add2 (E_PANED (priv->hpaned), priv->view_vbox);
 	e_paned_set_position (E_PANED (priv->hpaned), DEFAULT_SHORTCUT_BAR_WIDTH);
 
-	bonobo_win_set_contents (BONOBO_WIN (shell_view), priv->hpaned);
+	bonobo_window_set_contents (BONOBO_WINDOW (shell_view), priv->hpaned);
 
 	/* Show stuff.  */
 
@@ -618,7 +618,7 @@ class_init (EShellViewClass *klass)
 
 	object_class->destroy = destroy;
 
-	parent_class = gtk_type_class (BONOBO_TYPE_WIN);
+	parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);
 
 	signals[SHORTCUT_BAR_MODE_CHANGED]
 		= gtk_signal_new ("shortcut_bar_mode_changed",
@@ -842,7 +842,7 @@ e_shell_view_construct (EShellView *shell_view,
 
 	priv = shell_view->priv;
 
-	view = E_SHELL_VIEW (bonobo_win_construct (BONOBO_WIN (shell_view), "evolution", "Evolution"));
+	view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Evolution"));
 
 	if (!view) {
 		gtk_object_unref (GTK_OBJECT (shell_view));
@@ -859,7 +859,7 @@ e_shell_view_construct (EShellView *shell_view,
 	priv->shell = shell;
 
 	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WIN (shell_view));
+	bonobo_ui_container_set_win (container, BONOBO_WINDOW (shell_view));
 
 	priv->ui_component = bonobo_ui_component_new ("evolution");
 	bonobo_ui_component_set_container (priv->ui_component,
@@ -1337,7 +1337,7 @@ e_shell_view_display_uri (EShellView *shell_view,
 
 	priv = shell_view->priv;
 
-	bonobo_win_freeze (BONOBO_WIN (shell_view));
+	bonobo_window_freeze (BONOBO_WINDOW (shell_view));
 
 	if (uri == NULL) {
 		gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
@@ -1380,7 +1380,7 @@ e_shell_view_display_uri (EShellView *shell_view,
  end:
 	update_for_current_uri (shell_view);
 
-	bonobo_win_thaw (BONOBO_WIN (shell_view));
+	bonobo_window_thaw (BONOBO_WINDOW (shell_view));
 
 	return retval;
 }
@@ -1619,4 +1619,4 @@ e_shell_view_load_settings (EShellView *shell_view,
 }
 
 
-E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WIN)
+E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WINDOW)
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 09b7a44f47..d3eb889fec 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -56,13 +56,13 @@ enum _EShellViewSubwindowMode {
 typedef enum _EShellViewSubwindowMode EShellViewSubwindowMode;
 
 struct _EShellView {
-	BonoboWin parent;
+	BonoboWindow parent;
 
 	EShellViewPrivate *priv;
 };
 
 struct _EShellViewClass {
-	BonoboWinClass parent_class;
+	BonoboWindowClass parent_class;
 
 	/* Signals.  */
 	void (* shortcut_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode new_mode);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dc355c85e7..6ae909a25f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -892,7 +892,7 @@ save_settings_for_component (EShell *shell,
 
 	CORBA_exception_init (&ev);
 
-	session_interface = Bonobo_Unknown_query_interface (unknown_interface, "IDL:Evolution/Session:1.0", &ev);
+	session_interface = Bonobo_Unknown_queryInterface (unknown_interface, "IDL:Evolution/Session:1.0", &ev);
 	if (ev._major != CORBA_NO_EXCEPTION || CORBA_Object_is_nil (session_interface, &ev)) {
 		CORBA_exception_free (&ev);
 		return TRUE;
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 1ca69da867..f9127c56c0 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -459,7 +459,7 @@ evolution_storage_register_on_shell (EvolutionStorage *evolution_storage,
 
 	CORBA_exception_init (&ev);
 
-	corba_storage_registry = Bonobo_Unknown_query_interface (corba_shell,
+	corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell,
 								 "IDL:Evolution/StorageRegistry:1.0",
 								 &ev);
 	if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) {