All this snot just to fix bug #38925 and an attempt to fix bug #38926 (but

2003-03-07  Jeffrey Stedfast  <fejj@ximian.com>

	All this snot just to fix bug #38925 and an attempt to fix bug
	#38926 (but it seems no matter what I do, I can't work around the
	bonoboness/modality/whatever of the shell's preferences dialog).

	* mail-account-gui.c (sig_add_new_signature): Get the toplevel
	parent GtkWindow and pass that along to
	mail_composer_prefs_new_signature() so that window layering can be
	done correctly.

	* mail-composer-prefs.c (mail_composer_prefs_new_signature):
	Simplify. We don't want to add the signature to the list until
	after they have saved.
	(sig_edit_cb): Pass FALSE as the is_new argument to
	mail_signature_editor().
	(sig_event_client): Listen for signatures being added.
	(mail_composer_prefs_new_signature): Now takes a GtkWindow arg as
	the first arg rather than a MailComposerPrefs arg since we don't
	really need it to be a MailComposerPrefs object. We'd rather use
	the first arg as the parent GtkWindow so that we can set
	transience for the editor window.

	* mail-signature-editor.c (mail_signature_editor): Now takes a
	'parent' argument (so we can set transient_for()) and a 'is_new'
	argument specifying whether the editor is editing a new signature
	or not. If it is, when the user saves, it will be added to the
	signature list. otherwise it won't.
	(sig_name_changed): Only use the mail_config_signature_set_name()
	interface if it is *not* a new signature.
	(menu_file_save_cb): If is_new, then save the signature to the
	config - otherwise do what we did before and set the modifications
	to it and emit the CHANGED event.

	* mail-config.c (mail_config_signature_new): Renamed from
	mail_config_signature_add(). We no longer immediately add the
	signature to the list of saved signatures.
	(mail_config_signature_add): New function which adds the signature
	and emits the SIG_ADDED event.

svn path=/trunk/; revision=20221

1 files changed, 11 insertions, 8 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index 4e3f634aaf..f65eee55da 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1206,14 +1206,14 @@ get_new_signature_filename (void)
 	return NULL;
 }
 
+
 MailConfigSignature *
-mail_config_signature_add (gboolean html, const char *script)
+mail_config_signature_new (gboolean html, const char *script)
 {
 	MailConfigSignature *sig;
 	
 	sig = g_new0 (MailConfigSignature, 1);
 	
-	/* printf ("mail_config_signature_add %d\n", config->sig_nextid); */
 	sig->id = config->sig_nextid++;
 	sig->name = g_strdup (_("Unnamed"));
 	if (script)
@@ -1222,14 +1222,17 @@ mail_config_signature_add (gboolean html, const char *script)
 		sig->filename = get_new_signature_filename ();
 	sig->html = html;
 	
-	config->signatures = g_slist_append (config->signatures, sig);
-	
-	config_write_signatures ();
+	return sig;
+}
+
+
+void
+mail_config_signature_add (MailConfigSignature *sig)
+{
+	g_assert (g_slist_find (config->signatures, sig) == NULL);
 	
+	config->signatures = g_slist_append (config->signatures, sig);
 	mail_config_signature_emit_event (MAIL_CONFIG_SIG_EVENT_ADDED, sig);
-	/* printf ("mail_config_signature_add end\n"); */
-	
-	return sig;
 }
 
 static void