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

	* contact-editor/e-contact-editor.c (tb_save_and_close_cb):

	* gui/component/addressbook.c (toggle_view_as_cb):

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

	* notes/component-factory.c (control_activate_cb):

svn path=/trunk/; revision=6087

6 files changed, 27 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 22d5b2daa9..9228d260b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-20  Michael Meeks  <michael@helixcode.com>
+
+	* notes/component-factory.c (control_activate_cb): 
+
 2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
 
 	* NEWS (General, Addressbook): Updated NEWS for addressbook and
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b4a317d9b5..700f09818d 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-20  Michael Meeks  <michael@helixcode.com>
+
+	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
+
+	* gui/component/addressbook.c (toggle_view_as_cb): 
+
 2000-10-20  JP Rosevear  <jpr@helixcode.com>
 
 	* conduit/address-conduit.h: New structure of file - similar
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index cbff738340..c0921a7204 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -701,7 +701,7 @@ delete_cb (GtkWidget *widget, gpointer data)
 
 /* Emits the signal to request printing a card */
 static void
-print_cb (BonoboUIHandler *uih, void *data, const char *path)
+print_cb (BonoboUIComponent *uih, void *data, const char *path)
 {
 	EContactEditor *ce;
 
@@ -715,7 +715,7 @@ print_cb (BonoboUIHandler *uih, void *data, const char *path)
 
 /* Toolbar/Save and Close callback */
 static void
-tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path)
+tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
 {
 	EContactEditor *ce;
 
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index b096b2bde7..dee910c258 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -98,7 +98,7 @@ editor_closed_cb (EContactEditor *ce, gpointer data)
 }
 
 static void
-new_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	ECard *card;
 	EBook *book;
@@ -134,7 +134,7 @@ null_cb (EBook *book, EBookStatus status, gpointer closure)
 }
 
 static void
-new_server_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+new_server_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	ELDAPServer *server = g_new (ELDAPServer, 1);
 	EBook *book;
@@ -167,7 +167,7 @@ new_server_cb (BonoboUIHandler *uih, void *user_data, const char *path)
 #endif
 
 static void
-search_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	EBook *book;
 	AddressbookView *view = (AddressbookView *) user_data;
@@ -182,7 +182,7 @@ search_cb (BonoboUIHandler *uih, void *user_data, const char *path)
 
 #if 0
 static void
-find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+find_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	gint result;
 	GtkWidget* search_entry = gtk_entry_new();
@@ -218,14 +218,14 @@ find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
 #endif
 
 static void
-delete_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = (AddressbookView *) user_data;
 	e_addressbook_view_delete_selection(view->view);
 }
 
 static void
-print_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = (AddressbookView *) user_data;
 	e_addressbook_view_print(view->view);
@@ -279,14 +279,14 @@ make_quick_search_widget (GtkSignalFunc start_search_func,
 }
 
 static void
-show_all_contacts_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+show_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = (AddressbookView *) user_data;
 	e_addressbook_view_show_all(view->view);
 }
 
 static void
-stop_loading_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = (AddressbookView *) user_data;
 	e_addressbook_view_stop(view->view);
@@ -330,7 +330,7 @@ change_view_type (AddressbookView *view, EAddressbookViewType view_type)
 }
 
 static void
-toggle_view_as_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+toggle_view_as_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = user_data;
 	EAddressbookViewType view_type;
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index cbff738340..c0921a7204 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -701,7 +701,7 @@ delete_cb (GtkWidget *widget, gpointer data)
 
 /* Emits the signal to request printing a card */
 static void
-print_cb (BonoboUIHandler *uih, void *data, const char *path)
+print_cb (BonoboUIComponent *uih, void *data, const char *path)
 {
 	EContactEditor *ce;
 
@@ -715,7 +715,7 @@ print_cb (BonoboUIHandler *uih, void *data, const char *path)
 
 /* Toolbar/Save and Close callback */
 static void
-tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path)
+tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
 {
 	EContactEditor *ce;
 
diff --git a/notes/component-factory.c b/notes/component-factory.c
index df7d14c129..58ebdf8c8d 100644
--- a/notes/component-factory.c
+++ b/notes/component-factory.c
@@ -18,7 +18,7 @@ static const EvolutionShellComponentFolderType folder_types[] = {
 };
 
 static void
-new_note_cb (BonoboUIHandler *uih, void *user_data, const char *path)
+new_note_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	g_print ("new note!\n");
 }
@@ -31,13 +31,13 @@ static GnomeUIInfo gnome_toolbar [] = {
 #ifdef THIS_NEEDS_UPDATING_FOR_NEW_BONOBOS
 
 static void
-control_deactivate (BonoboControl *control, BonoboUIHandler *uih)
+control_deactivate (BonoboControl *control, BonoboUIComponent *uih)
 {
 	bonobo_ui_handler_dock_remove (uih, "/Toolbar");
 }
 
 static void
-control_activate (BonoboControl *control, BonoboUIHandler *uih)
+control_activate (BonoboControl *control, BonoboUIComponent *uih)
 {
 	Bonobo_UIContainer remote_uih;
 	GtkWidget *toolbar, *toolbar_frame;
@@ -75,7 +75,7 @@ static void
 control_activate_cb (BonoboControl *control,
 		     gboolean activate)
 {
-	BonoboUIHandler *uih;
+	BonoboUIComponent *uih;
 
 	uih = bonobo_control_get_ui_handler (control);
 	g_assert (uih);