From 429234ff213ba04b6d0b02a28ed68aaa8af7c02c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 2 Sep 2010 13:21:08 -0400
Subject: Convert composer autosave to an EExtension.

Given the way the autosave feature was awkwardly bolted on to the
composer, an EExtension seemed like a natural fit.  And it helped
clean up some object lifecycle hacks (and bugs).

What we have now is a new module consisting of two EExtensions:

   EComposerAutosave extends EMsgComposer and determines when to
   kick off an asynchronous autosave operation.

   EComposerRegistry extends EShell and offers to restore orphaned
   autosave files on startup (which is also asynchronous now).

e-autosave-utils.c holds the actual asynchronous functions and a few
other miscellaneous utility functions.

Source code for the new module lives in /modules/composer-autosave.
---
 mail/em-composer-utils.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index aa2a550197..82ba4bcd5c 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -50,7 +50,6 @@
 #include "em-composer-utils.h"
 #include "composer/e-msg-composer.h"
 #include "composer/e-composer-actions.h"
-#include "composer/e-composer-autosave.h"
 #include "composer/e-composer-post-header.h"
 #include "em-folder-selector.h"
 #include "em-folder-tree.h"
@@ -255,10 +254,8 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
 			/* queue a message send */
 			mail_send ();
 		}
-	} else {
-		e_msg_composer_set_enable_autosave (send->composer, TRUE);
+	} else
 		gtk_widget_show (GTK_WIDGET (send->composer));
-	}
 
 	camel_message_info_free (info);
 
@@ -555,8 +552,6 @@ em_utils_composer_send_cb (EMsgComposer *composer)
 	send->composer = g_object_ref (composer);
 	gtk_widget_hide (GTK_WIDGET (composer));
 
-	e_msg_composer_set_enable_autosave (composer, FALSE);
-
 	mail_append_mail (
 		folder, message, info, composer_send_queued_cb, send);
 
-- 
cgit