Added key accelerators to a bunch of the config options and moved the Bcc

2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.glade: Added key accelerators to a bunch of the
	config options and moved the Bcc and empty-subject checkboxes to
	the composer tab where they belong.

	* mail-callbacks.c (providers_config): Raise the dialog if it
	exists already.
	(manage_subscriptions): Raise the dialog if it already exists.
	(main_select_first_unread): Removed (we haven't needed this code
	in ages).
	(select_first_unread): Same.
	(save_msg_ok): If the path is empty, just return.

	* mail-local.c (mail_local_reconfigure_folder): Raise the dialog
	if it already exists.

svn path=/trunk/; revision=11719

7 files changed, 91 insertions, 86 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2af99139da..3c26efdc5b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,22 @@
 2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* mail-config.glade: Added key accelerators to a bunch of the
+	config options and moved the Bcc and empty-subject checkboxes to
+	the composer tab where they belong.
+
+	* mail-callbacks.c (providers_config): Raise the dialog if it
+	exists already.
+	(manage_subscriptions): Raise the dialog if it already exists.
+	(main_select_first_unread): Removed (we haven't needed this code
+	in ages).
+	(select_first_unread): Same.
+	(save_msg_ok): If the path is empty, just return.
+
+	* mail-local.c (mail_local_reconfigure_folder): Raise the dialog
+	if it already exists.
+
+2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
+
 	* mail-callbacks.c (expunge_folder): Set the message-display
 	message to NULL if we can't get an info too.
 
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 4275079894..cee845c732 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -1016,13 +1016,13 @@ mail_remove_storage (CamelStore *store)
 	 * any call to camel_session_get_{service,store} with the same
 	 * URL will always return the same object. So this works.
 	 */
-
+	
 	storage = g_hash_table_lookup (storages_hash, store);
 	g_hash_table_remove (storages_hash, store);
 	
 	shell_client = evolution_shell_component_get_owner (shell_component);
 	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
+	
 	evolution_storage_deregister_on_shell (storage, corba_shell);
 	
 	camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index f5084270d3..1f37511e96 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -70,10 +70,10 @@ static void
 mail_account_editor_class_init (MailAccountEditorClass *class)
 {
 	GtkObjectClass *object_class;
-
+	
 	object_class = (GtkObjectClass *) class;
 	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
+	
 	object_class->finalize = mail_account_editor_finalize;
 }
 
@@ -81,7 +81,7 @@ static void
 mail_account_editor_finalize (GtkObject *obj)
 {
 	MailAccountEditor *editor = (MailAccountEditor *) obj;
-
+	
 	mail_account_gui_destroy (editor->gui);
         ((GtkObjectClass *)(parent_class))->finalize (obj);
 }
@@ -109,10 +109,16 @@ apply_changes (MailAccountEditor *editor)
 	}
 	
 	mail_account_gui_save (editor->gui);
+	
+	/* FIXME: uh, what the hell is this for? */
 	account = editor->gui->account;
 	
 	/* save any changes we may have */
 	mail_config_write ();
+	
+	/* FIXME: #1549: if the account was a remote store, delete it from the folder-tree and re-add it */
+	/* FIXME: preferably, we'd only do this if there were changes... oh well */
+	
 	return TRUE;
 }
 
@@ -120,7 +126,7 @@ static void
 apply_clicked (GtkWidget *widget, gpointer data)
 {
 	MailAccountEditor *editor = data;
-
+	
 	apply_changes (editor);
 }
 
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index e5ac76bc56..b140f5197f 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -61,7 +61,6 @@
 #include "subscribe-dialog.h"
 #include "e-messagebox.h"
 
-/* FIXME: is there another way to do this? */
 #include "Evolution.h"
 #include "evolution-storage.h"
 
@@ -169,31 +168,11 @@ check_send_configuration (FolderBrowser *fb)
 	return TRUE;
 }
 
-#if 0
-/* FIXME: is this still required when we send & receive email ?  I am not so sure ... */
-static void
-main_select_first_unread (CamelObject *object, gpointer event_data, gpointer data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (data);
-	/*ETable *table = E_TABLE_SCROLLED (fb->message_list->etable)->table;*/
-	
-	message_list_select (fb->message_list, 0, MESSAGE_LIST_SELECT_NEXT,
-  			     0, CAMEL_MESSAGE_SEEN);
-}
-
-static void
-select_first_unread (CamelObject *object, gpointer event_data, gpointer data)
-{
-	mail_op_forward_event (main_select_first_unread, object, event_data, data);
-}
-#endif
-
 void
 send_receive_mail (GtkWidget *widget, gpointer user_data)
 {
 	const MailConfigAccount *account;
 	
-	/* receive first then send, this is a temp fix for POP-before-SMTP */
 	if (!mail_config_is_configured ()) {
 		if (!configure_mail (FOLDER_BROWSER (user_data)))
 			return;
@@ -1481,29 +1460,31 @@ save_msg_ok (GtkWidget *widget, gpointer user_data)
 {
 	CamelFolder *folder;
 	GPtrArray *uids;
-	char *path;
+	const char *path;
 	int fd, ret = 0;
 	
-	/* FIXME: is path an allocated string? */
 	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (user_data));
+	if (path[0] == '\0')
+		return;
 	
         fd = open (path, O_RDONLY);
 	if (fd != -1) {
-		GtkWidget *dlg;
+		GtkWidget *dialog;
 		GtkWidget *text;
 		
 		close (fd);
 		
-		dlg = gnome_dialog_new (_("Overwrite file?"),
-					GNOME_STOCK_BUTTON_YES, 
-					GNOME_STOCK_BUTTON_NO,
-					NULL);
+		dialog = gnome_dialog_new (_("Overwrite file?"),
+					   GNOME_STOCK_BUTTON_YES, 
+					   GNOME_STOCK_BUTTON_NO,
+					   NULL);
+		
 		text = gtk_label_new (_("A file by that name already exists.\nOverwrite it?"));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), text, TRUE, TRUE, 4);
-		gtk_window_set_policy (GTK_WINDOW (dlg), FALSE, TRUE, FALSE);
+		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), text, TRUE, TRUE, 4);
+		gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
 		gtk_widget_show (text);
 		
-		ret = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
+		ret = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
 	}
 	
 	if (ret == 0) {
@@ -1803,7 +1784,7 @@ providers_config (BonoboUIComponent *uih, void *user_data, const char *path)
 		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
 		dialog = NULL;
 	} else {
-		/* FIXME: raise the dialog? */
+		gdk_window_raise (GTK_WIDGET (dialog)->window);
 	}
 }
 
@@ -1908,7 +1889,7 @@ print_preview_msg (GtkWidget *button, gpointer user_data)
 
 /******************** Begin Subscription Dialog ***************************/
 
-static GtkObject *subscribe_dialog = NULL;
+static GtkWidget *subscribe_dialog = NULL;
 
 static void
 subscribe_dialog_destroy (GtkWidget *widget, gpointer user_data)
@@ -1925,9 +1906,9 @@ manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
 				    subscribe_dialog_destroy, NULL);
 		
 		subscribe_dialog_run_and_close (SUBSCRIBE_DIALOG (subscribe_dialog));
-		gtk_object_unref (subscribe_dialog);
+		gtk_object_unref (GTK_OBJECT (subscribe_dialog));
 	} else {
-		/* FIXME: raise the subscription dialog window... */
+		gdk_window_raise (GTK_WIDGET (subscribe_dialog)->window);
 	}
 }
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 146fa20de2..fae3a8a0d0 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -278,7 +278,7 @@ config_read (void)
 	gint len, i, default_num;
 	
 	mail_config_clear ();
-		
+	
 	len = bonobo_config_get_long_with_default (config->db, 
 	        "/Mail/Accounts/num", 0, NULL);
 	
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index ea1fbe4b05..48a78496ed 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2296,7 +2296,7 @@ Kerberos
 	    <name>cmdMailAble</name>
 	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <label>Enable</label>
+	    <label>E_nable</label>
 	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
@@ -2380,7 +2380,7 @@ Kerberos
 	  <name>cmdNewsAdd</name>
 	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
-	  <label>Add</label>
+	  <label>_Add</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
@@ -2389,7 +2389,7 @@ Kerberos
 	  <name>cmdNewsEdit</name>
 	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
-	  <label>Edit</label>
+	  <label>_Edit</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
@@ -2398,7 +2398,7 @@ Kerberos
 	  <name>cmdNewsDelete</name>
 	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
-	  <label>Delete</label>
+	  <label>_Delete</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
       </widget>
@@ -2439,7 +2439,7 @@ Kerberos
 	  <class>GtkCheckButton</class>
 	  <name>chckHighlightCitations</name>
 	  <can_focus>True</can_focus>
-	  <label>Highlight citations with</label>
+	  <label>_Highlight citations with</label>
 	  <active>False</active>
 	  <draw_indicator>True</draw_indicator>
 	  <child>
@@ -2496,7 +2496,7 @@ Kerberos
 	  <class>GtkCheckButton</class>
 	  <name>checkMarkTimeout</name>
 	  <can_focus>True</can_focus>
-	  <label>Mark messages as Read after</label>
+	  <label>_Mark messages as Read after</label>
 	  <active>False</active>
 	  <draw_indicator>True</draw_indicator>
 	  <child>
@@ -2569,7 +2569,7 @@ Kerberos
 	    <class>GtkRadioButton</class>
 	    <name>radioImagesNever</name>
 	    <can_focus>True</can_focus>
-	    <label>Never load images off the net</label>
+	    <label>_Never load images off the net</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>images</group>
@@ -2584,7 +2584,7 @@ Kerberos
 	    <class>GtkRadioButton</class>
 	    <name>radioImagesSometimes</name>
 	    <can_focus>True</can_focus>
-	    <label>Load images if sender is in addressbook</label>
+	    <label>_Load images if sender is in addressbook</label>
 	    <active>True</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>images</group>
@@ -2599,7 +2599,7 @@ Kerberos
 	    <class>GtkRadioButton</class>
 	    <name>radioImagesAlways</name>
 	    <can_focus>True</can_focus>
-	    <label>Always load images off the net</label>
+	    <label>_Always load images off the net</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>images</group>
@@ -2616,7 +2616,7 @@ Kerberos
 	<class>GtkCheckButton</class>
 	<name>chkThreadedList</name>
 	<can_focus>True</can_focus>
-	<label>Message list should display in a threaded fashion by default</label>
+	<label>Message list should display in a _threaded fashion by default</label>
 	<active>False</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -2630,7 +2630,7 @@ Kerberos
 	<class>GtkCheckButton</class>
 	<name>chkShowPreview</name>
 	<can_focus>True</can_focus>
-	<label>Message preview should be displayed by default</label>
+	<label>Message _preview should be displayed by default</label>
 	<active>True</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -2665,7 +2665,7 @@ Kerberos
 	<class>GtkCheckButton</class>
 	<name>chkSendHTML</name>
 	<can_focus>True</can_focus>
-	<label>Send mail in HTML format by default.</label>
+	<label>_Send mail in HTML format by default.</label>
 	<active>False</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -2719,6 +2719,34 @@ Quoted
 	  </child>
 	</widget>
       </widget>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>chkPromptEmptySubject</name>
+	<can_focus>True</can_focus>
+	<label>Prompt when sending messages with an _empty subject</label>
+	<active>True</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>chkPromptBccOnly</name>
+	<can_focus>True</can_focus>
+	<label>Prompt when sending messages with only _Bcc recipients defined</label>
+	<active>True</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
     </widget>
 
     <widget>
@@ -2755,13 +2783,14 @@ Quoted
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>lblPgpPath</name>
-	  <label>PGP binary path:</label>
+	  <label>PGP _binary path:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <default_focus_target>combo-entry1</default_focus_target>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -2799,7 +2828,7 @@ Quoted
 	<class>GtkCheckButton</class>
 	<name>chkRememberPGPPassphrase</name>
 	<can_focus>True</can_focus>
-	<label>Remember PGP Passphrase until exit</label>
+	<label>_Remember PGP Passphrase until exit</label>
 	<active>True</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -2856,7 +2885,7 @@ Quoted
 	<class>GtkCheckButton</class>
 	<name>chkEmptyTrashOnExit</name>
 	<can_focus>True</can_focus>
-	<label>Empty trash folders on exit</label>
+	<label>_Empty trash folders on exit</label>
 	<active>False</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -2865,34 +2894,6 @@ Quoted
 	  <fill>False</fill>
 	</child>
       </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>chkPromptEmptySubject</name>
-	<can_focus>True</can_focus>
-	<label>Prompt when sending messages with an empty subject</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>chkPromptBccOnly</name>
-	<can_focus>True</can_focus>
-	<label>Prompt when sending messages with only Bcc recipients defined</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
     </widget>
 
     <widget>
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 6671087ea2..e5cb0fb6d8 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -984,7 +984,7 @@ mail_local_reconfigure_folder (FolderBrowser *fb)
 		reconfigure_folder_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
 	
 	if ((gd = g_hash_table_lookup (reconfigure_folder_hash, fb->folder))) {
-		/* FIXME: raise this dialog?? */
+		gdk_window_raise (GTK_WIDGET (gd)->window);
 		return;
 	}