s/BonoboUIHandler/BonoboUIComponent/

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

	* mail.h: s/BonoboUIHandler/BonoboUIComponent/

	* mail-callbacks.c (run_filter_ondemand): ditto.

	* session.c (forget_passwords): ditto.

svn path=/trunk/; revision=6085

6 files changed, 38 insertions, 30 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4d874a4210..9303da4692 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-20  Michael Meeks  <michael@helixcode.com>
+
+	* mail.h: s/BonoboUIHandler/BonoboUIComponent/
+
+	* mail-callbacks.c (run_filter_ondemand): ditto.
+
+	* session.c (forget_passwords): ditto.
+
 2000-10-20  Dan Winship  <danw@helixcode.com>
 
 	* evolution-mail.oafinfo: Declare composer factory.
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 81ed429e40..6b41e87d2e 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -32,6 +32,7 @@
 #endif
 #include <bonobo.h>
 
+#include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 2e74aeffd6..18bcbecf70 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -545,7 +545,7 @@ copy_msg (GtkWidget *widget, gpointer user_data)
 }
 
 void
-select_all (BonoboUIHandler *uih, void *user_data, const char *path)
+select_all (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
         MessageList *ml = fb->message_list;
@@ -559,7 +559,7 @@ select_all (BonoboUIHandler *uih, void *user_data, const char *path)
 }
 
 void
-invert_selection (BonoboUIHandler *uih, void *user_data, const char *path)
+invert_selection (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
         MessageList *ml = fb->message_list;
@@ -573,7 +573,7 @@ invert_selection (BonoboUIHandler *uih, void *user_data, const char *path)
 }
 
 void
-mark_as_seen (BonoboUIHandler *uih, void *user_data, const char *path)
+mark_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
 {
         FolderBrowser *fb = FOLDER_BROWSER(user_data);
         MessageList *ml = fb->message_list;
@@ -589,7 +589,7 @@ mark_as_seen (BonoboUIHandler *uih, void *user_data, const char *path)
 }
 
 void
-mark_as_unseen (BonoboUIHandler *uih, void *user_data, const char *path)
+mark_as_unseen (BonoboUIComponent *uih, void *user_data, const char *path)
 {
         FolderBrowser *fb = FOLDER_BROWSER(user_data);
         MessageList *ml = fb->message_list;
@@ -665,7 +665,7 @@ delete_msg (GtkWidget *button, gpointer user_data)
 }
 
 void
-expunge_folder (BonoboUIHandler *uih, void *user_data, const char *path)
+expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	FolderBrowser *fb = FOLDER_BROWSER(user_data);
 	
@@ -695,7 +695,7 @@ filter_druid_clicked (GtkWidget *w, int button, FolderBrowser *fb)
 }
 
 void
-filter_edit (BonoboUIHandler *uih, void *user_data, const char *path)
+filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	FilterContext *fc;
@@ -729,13 +729,13 @@ filter_edit (BonoboUIHandler *uih, void *user_data, const char *path)
 }
 
 void
-vfolder_edit_vfolders (BonoboUIHandler *uih, void *user_data, const char *path)
+vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	vfolder_edit();
 }
 
 void
-providers_config (BonoboUIHandler *uih, void *user_data, const char *path)
+providers_config (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	mail_config ((FOLDER_BROWSER (user_data))->shell);
 }
@@ -840,7 +840,7 @@ print_preview_msg (GtkWidget *button, gpointer user_data)
 }
 
 void
-manage_subscriptions (BonoboUIHandler *uih, void *user_data, const char *path)
+manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	/* XXX pass in the selected storage */
 	GtkWidget *subscribe = subscribe_dialog_new ((FOLDER_BROWSER (user_data))->shell);
@@ -849,7 +849,7 @@ manage_subscriptions (BonoboUIHandler *uih, void *user_data, const char *path)
 }
 
 void
-configure_folder(BonoboUIHandler *uih, void *user_data, const char *path)
+configure_folder(BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	FolderBrowser *fb = FOLDER_BROWSER(user_data);
 	
@@ -871,19 +871,19 @@ view_msg (GtkWidget *widget, gpointer user_data)
 }
 
 void
-view_message (BonoboUIHandler *uih, void *user_data, const char *path)
+view_message (BonoboUIComponent *uih, void *user_data, const char *path)
 {
         view_msg (NULL, user_data);
 }
 
 void
-edit_message (BonoboUIHandler *uih, void *user_data, const char *path)
+edit_message (BonoboUIComponent *uih, void *user_data, const char *path)
 {
         edit_msg (NULL, user_data);
 }
 
 void
-run_filter_ondemand (BonoboUIHandler *uih, gpointer user_data, const char *path)
+run_filter_ondemand (BonoboUIComponent *uih, gpointer user_data, const char *path)
 {
 	struct fb_ondemand_closure *oc = (struct fb_ondemand_closure *) user_data;
 	
diff --git a/mail/mail.h b/mail/mail.h
index 3b4b7b81df..b92766df31 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -87,19 +87,19 @@ void print_preview_msg  (GtkWidget *widget, gpointer user_data);
 void edit_msg           (GtkWidget *widget, gpointer user_data);
 void view_msg           (GtkWidget *widget, gpointer user_data);
 
-void select_all      (BonoboUIHandler *uih, void *user_data, const char *path);
-void invert_selection (BonoboUIHandler *uih, void *user_data, const char *path);
-void mark_as_seen    (BonoboUIHandler *uih, void *user_data, const char *path);
-void mark_as_unseen  (BonoboUIHandler *uih, void *user_data, const char *path);
-void edit_message    (BonoboUIHandler *uih, void *user_data, const char *path);
-void view_message    (BonoboUIHandler *uih, void *user_data, const char *path);
-void expunge_folder  (BonoboUIHandler *uih, void *user_data, const char *path);
-void filter_edit     (BonoboUIHandler *uih, void *user_data, const char *path);
-void vfolder_edit_vfolders (BonoboUIHandler *uih, void *user_data, const char *path);
-void providers_config (BonoboUIHandler *uih, void *user_data, const char *path);
-void manage_subscriptions (BonoboUIHandler *uih, void *user_data, const char *path);
-
-void configure_folder (BonoboUIHandler *uih, void *user_data, const char *path);
+void select_all      (BonoboUIComponent *uih, void *user_data, const char *path);
+void invert_selection (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_seen    (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_unseen  (BonoboUIComponent *uih, void *user_data, const char *path);
+void edit_message    (BonoboUIComponent *uih, void *user_data, const char *path);
+void view_message    (BonoboUIComponent *uih, void *user_data, const char *path);
+void expunge_folder  (BonoboUIComponent *uih, void *user_data, const char *path);
+void filter_edit     (BonoboUIComponent *uih, void *user_data, const char *path);
+void vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path);
+void providers_config (BonoboUIComponent *uih, void *user_data, const char *path);
+void manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void configure_folder (BonoboUIComponent *uih, void *user_data, const char *path);
 
 void mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, gboolean to_all);
 void composer_send_cb (EMsgComposer *composer, gpointer data);
@@ -108,7 +108,7 @@ void composer_postpone_cb (EMsgComposer *composer, gpointer data);
 void mail_print_preview_msg (MailDisplay *md);
 void mail_print_msg         (MailDisplay *md);
 
-void run_filter_ondemand (BonoboUIHandler *uih, gpointer user_data, const char *path);
+void run_filter_ondemand (BonoboUIComponent *uih, gpointer user_data, const char *path);
 
 /* mail view */
 GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMessage *msg);
@@ -124,7 +124,7 @@ EvolutionStorage* mail_lookup_storage (CamelService *service);
 void session_init (void);
 char *mail_request_dialog (const char *prompt, gboolean secret,
 			   const char *key, gboolean async);
-void forget_passwords (BonoboUIHandler *uih, void *user_data,
+void forget_passwords (BonoboUIComponent *uih, void *user_data,
 		       const char *path);
 extern CamelSession *session;
 
diff --git a/mail/session.c b/mail/session.c
index e3dcbd541b..54243bc731 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -208,7 +208,7 @@ free_entry (gpointer key, gpointer value, gpointer user_data)
 }
 
 void
-forget_passwords (BonoboUIHandler *uih, void *user_data, const char *path)
+forget_passwords (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	g_hash_table_foreach_remove (passwords, free_entry, NULL);
 }
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
index 84538f16f2..23e220c25d 100644
--- a/mail/subscribe-dialog.h
+++ b/mail/subscribe-dialog.h
@@ -9,7 +9,6 @@
 #include <gtk/gtktable.h>
 #include <gal/e-table/e-tree-model.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-compat.h>
 #include <bonobo/bonobo-property-bag.h>
 #include "shell/evolution-storage.h"