update to new UI handler

2000-10-20  Michael Meeks  <michael@helixcode.com>

	* evolution-shell-component-client.c
	(evolution_shell_component_client_populate_folder_context_menu),
	(evolution_shell_component_client_create_view): update to new UI handler

	* e-shell-view-menu.c (command_create_folder): ditto.

	* e-storage-set-view.c (popup_folder_menu): ditto.

	* evolution-shell-component-client.h: kill ui-compat include.

svn path=/trunk/; revision=6082

7 files changed, 28 insertions, 20 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index ef5755c5ec..1006b40bc1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-20  Michael Meeks  <michael@helixcode.com>
+
+	* evolution-shell-component-client.c
+	(evolution_shell_component_client_populate_folder_context_menu),
+	(evolution_shell_component_client_create_view): update to new UI handler
+
+	* e-shell-view-menu.c (command_create_folder): ditto.
+
+	* e-storage-set-view.c (popup_folder_menu): ditto.
+
+	* evolution-shell-component-client.h: kill ui-compat include.
+
 2000-10-19  Iain Holmes  <iain@helixcode.com>
 
 	*e-shell-view.c (e_shell_view_save_settings): If there is no view
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 71ef8f30d1..37cb1909ab 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -80,7 +80,7 @@ folder_bar_mode_changed_cb (EShellView *shell_view,
 
 /* Command callbacks.  */
 static void
-command_quit (BonoboUIHandler *uih,
+command_quit (BonoboUIComponent *uih,
 	      void *data,
 	      const char *path)
 {
@@ -94,7 +94,7 @@ command_quit (BonoboUIHandler *uih,
 }
 
 static void
-command_run_bugbuddy (BonoboUIHandler *uih,
+command_run_bugbuddy (BonoboUIComponent *uih,
 		      void *data,
 		      const char *path)
 {
@@ -128,7 +128,7 @@ zero_pointer(GtkObject *object, void **pointer)
 }
 
 static void
-command_about_box (BonoboUIHandler *uih,
+command_about_box (BonoboUIComponent *uih,
 		   void *data,
 		   const char *path)
 {
@@ -179,7 +179,7 @@ command_about_box (BonoboUIHandler *uih,
 }
 
 static void
-command_help (BonoboUIHandler *uih,
+command_help (BonoboUIComponent *uih,
 	      void *data,
 	      const char *path)
 {
@@ -244,7 +244,7 @@ command_toggle_shortcut_bar (BonoboUIComponent           *component,
 
 
 static void
-command_new_folder (BonoboUIHandler *uih,
+command_new_folder (BonoboUIComponent *uih,
 		    void *data,
 		    const char *path)
 {
@@ -267,7 +267,7 @@ command_new_folder (BonoboUIHandler *uih,
 }
 
 static void
-command_new_view (BonoboUIHandler *uih,
+command_new_view (BonoboUIComponent *uih,
 		  void *data,
 		  const char *path)
 {
@@ -314,7 +314,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
 }
 
 static void
-command_goto_folder (BonoboUIHandler *uih,
+command_goto_folder (BonoboUIComponent *uih,
 		     void *data,
 		     const char *path)
 {
@@ -344,7 +344,7 @@ command_goto_folder (BonoboUIHandler *uih,
 }
 
 static void
-command_create_folder (BonoboUIHandler *uih,
+command_create_folder (BonoboUIComponent *uih,
 		       void *data,
 		       const char *path)
 {
diff --git a/shell/e-shell-view-menu.h b/shell/e-shell-view-menu.h
index 948a2aa6a3..7f8c3ce0b3 100644
--- a/shell/e-shell-view-menu.h
+++ b/shell/e-shell-view-menu.h
@@ -26,8 +26,6 @@
 #ifndef E_SHELL_VIEW_MENU_H
 #define E_SHELL_VIEW_MENU_H
 
-#include <bonobo/bonobo-ui-compat.h>
-
 #include "e-shell-view.h"
 
 void e_shell_view_menu_setup (EShellView *shell_view);
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 36afb0388b..3fdd555acc 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -201,7 +201,7 @@ get_pixbuf_for_folder (EStorageSetView *storage_set_view,
 
 #if 0
 static void
-folder_context_menu_activate_cb (BonoboUIHandler *uih,
+folder_context_menu_activate_cb (BonoboUIComponent *uih,
 				 void *data,
 				 const char *path)
 {
@@ -217,7 +217,7 @@ folder_context_menu_activate_cb (BonoboUIHandler *uih,
 
 static void
 populate_folder_context_menu_with_common_items (EStorageSetView *storage_set_view,
-						BonoboUIHandler *uih)
+						BonoboUIComponent *uih)
 {
 	bonobo_ui_handler_menu_new_item (uih, "/Activate",
 					 _("_View"), _("View the selected folder"),
@@ -236,7 +236,7 @@ popup_folder_menu (EStorageSetView *storage_set_view,
 	EvolutionShellComponentClient *handler;
 	EStorageSetViewPrivate *priv;
 	EFolderTypeRegistry *folder_type_registry;
-	BonoboUIHandler *uih;
+	BonoboUIComponent *uih;
 	EFolder *folder;
 
 	priv = storage_set_view->priv;
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 4a456040fa..26b2733620 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -398,7 +398,7 @@ evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *she
 
 EvolutionShellComponentResult
 evolution_shell_component_client_create_view (EvolutionShellComponentClient *shell_component_client,
-					      BonoboUIHandler *uih,
+					      BonoboUIComponent *uih,
 					      const char *physical_uri,
 					      const char *type_string,
 					      BonoboControl **control_return)
@@ -411,7 +411,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she
 	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
 	RETURN_ERROR_IF_FAIL (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
 	RETURN_ERROR_IF_FAIL (uih != NULL);
-	RETURN_ERROR_IF_FAIL (BONOBO_IS_UI_HANDLER (uih));
+	RETURN_ERROR_IF_FAIL (BONOBO_IS_UI_COMPONENT (uih));
 	RETURN_ERROR_IF_FAIL (physical_uri != NULL);
 	RETURN_ERROR_IF_FAIL (type_string != NULL);
 	RETURN_ERROR_IF_FAIL (control_return != NULL);
@@ -493,7 +493,7 @@ evolution_shell_component_client_async_remove_folder (EvolutionShellComponentCli
 
 void
 evolution_shell_component_client_populate_folder_context_menu (EvolutionShellComponentClient *shell_component_client,
-							       BonoboUIHandler *uih,
+							       BonoboUIComponent *uih,
 							       const char *physical_uri,
 							       const char *type)
 {
diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
index 70423c9056..1a0eab5cd7 100644
--- a/shell/evolution-shell-component-client.h
+++ b/shell/evolution-shell-component-client.h
@@ -25,7 +25,6 @@
 #define EVOLUTION_SHELL_COMPONENT_CLIENT_H
 
 #include <bonobo/bonobo-object-client.h>
-#include <bonobo/bonobo-ui-compat.h>
 
 #include "evolution-shell-component.h"
 
@@ -73,7 +72,7 @@ EvolutionShellComponentResult  evolution_shell_component_client_set_owner    (Ev
 EvolutionShellComponentResult  evolution_shell_component_client_unset_owner  (EvolutionShellComponentClient  *shell_component_client,
 									      Evolution_Shell                 shell);
 EvolutionShellComponentResult  evolution_shell_component_client_create_view  (EvolutionShellComponentClient  *shell_component_client,
-									      BonoboUIHandler                *uih,
+									      BonoboUIComponent                *uih,
 									      const char                     *physical_uri,
 									      const char                     *type_string,
 									      BonoboControl                 **control_return);
@@ -90,7 +89,7 @@ void  evolution_shell_component_client_async_remove_folder  (EvolutionShellCompo
 							     void                                  *data);
 
 void  evolution_shell_component_client_populate_folder_context_menu  (EvolutionShellComponentClient *shell_component_client,
-								      BonoboUIHandler               *uih,
+								      BonoboUIComponent               *uih,
 								      const char                    *physical_uri,
 								      const char                    *type);
 
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index 2ae350932c..bceb6a47cf 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -30,7 +30,6 @@
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-compat.h>
 
 #include "Evolution.h"