Sync with yet-another-mail-config branch.

2002-03-26  Jeffrey Stedfast  <fejj@ximian.com>

	Sync with yet-another-mail-config branch.

	* mail-composer-prefs.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-preferences.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-accounts.etspec: New file needed by mail-accounts.c

svn path=/trunk/; revision=16257

1 files changed, 1 insertions, 31 deletions

diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 736002c915..d1c25930d7 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -130,7 +130,7 @@ check_send_configuration (FolderBrowser *fb)
 	
 	/* Check general */
 	if (!mail_config_is_configured () && !configure_mail (fb))
-			return FALSE;
+		return FALSE;
 	
 	/* Get the default account */
 	account = mail_config_get_default_account ();
@@ -2712,36 +2712,6 @@ vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path
 }
 
 
-static MailAccountsDialog *accounts_dialog = NULL;
-
-static void
-accounts_dialog_close (GtkWidget *widget, gpointer user_data)
-{
-	accounts_dialog = NULL;
-}
-
-void
-providers_config (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (FOLDER_BROWSER_IS_DESTROYED (fb))
-		return;
-	
-	if (!accounts_dialog) {
-		accounts_dialog = mail_accounts_dialog_new (fb->shell);
-		gtk_widget_set_parent_window (GTK_WIDGET (accounts_dialog),
-					      GTK_WIDGET (FB_WINDOW (fb))->window);
-		gtk_signal_connect (GTK_OBJECT (accounts_dialog), "destroy",
-				    accounts_dialog_close, NULL);
-		gnome_dialog_set_close (GNOME_DIALOG (accounts_dialog), TRUE);
-		gtk_widget_show (GTK_WIDGET (accounts_dialog));
-	} else {
-		gdk_window_raise (GTK_WIDGET (accounts_dialog)->window);
-		gtk_widget_grab_focus (GTK_WIDGET (accounts_dialog));
-	}
-}
-
 /* static void
 header_print_cb (GtkHTML *html, GnomePrintContext *print_context,
 		 double x, double y, double width, double height, gpointer user_data)