diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-02 23:39:56 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-03 04:19:32 +0800 |
commit | e1faf763eb8256bfa43071b96bcd83d789b59002 (patch) | |
tree | 2b316984db3fa17760792978bac3ee7d0096caea /mail/em-composer-utils.c | |
parent | 98dd0ac727e7bff5ad056427fa04d579f838ba75 (diff) | |
download | gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar.gz gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar.bz2 gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar.lz gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar.xz gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.tar.zst gsoc2013-evolution-e1faf763eb8256bfa43071b96bcd83d789b59002.zip |
Move "ask-reply-close-browser" prompt to EMailBrowser.
EMailReader is an interface and should not know about specific classes
that implement its interface. Instead, EMailBrowser itself will prompt
in response to "composer-created" signals that include a source message.
This also removes the "destroy_when_done" parameter from
em_utils_forward_messages() since it's no longer needed.
(cherry picked from commit 43610e343194912394e5097655403f6ab7993ab0)
Conflicts:
mail/em-composer-utils.c
Diffstat (limited to 'mail/em-composer-utils.c')
-rw-r--r-- | mail/em-composer-utils.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 07a378b52d..850cc15de6 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -81,7 +81,6 @@ struct _AsyncContext { gchar *folder_uri; gchar *message_uid; gboolean replace; - GtkWidget *destroy_when_done; }; struct _ForwardData { @@ -103,9 +102,6 @@ async_context_free (AsyncContext *async_context) if (async_context->ptr_array != NULL) g_ptr_array_unref (async_context->ptr_array); - if (async_context->destroy_when_done != NULL) - gtk_widget_destroy (async_context->destroy_when_done); - g_free (async_context->folder_uri); g_free (async_context->message_uid); @@ -1973,7 +1969,6 @@ forward_got_messages_cb (GObject *source_object, ((hash_table == NULL) && (local_error != NULL))); if (e_activity_handle_cancellation (activity, local_error)) { - async_context->destroy_when_done = NULL; g_error_free (local_error); goto exit; @@ -1982,7 +1977,6 @@ forward_got_messages_cb (GObject *source_object, alert_sink, "mail:get-multiple-messages", local_error->message, NULL); - async_context->destroy_when_done = NULL; g_error_free (local_error); goto exit; } @@ -2021,8 +2015,6 @@ exit: * @folder: folder containing messages to forward * @uids: uids of messages to forward * @style: the forward style to use - * @destroy_when_done: a #GtkWidget to destroy with gtk_widget_destroy() - * when done; can be NULL * * Forwards a group of messages in the given style. * @@ -2044,8 +2036,7 @@ void em_utils_forward_messages (EMailReader *reader, CamelFolder *folder, GPtrArray *uids, - EMailForwardStyle style, - GtkWidget *destroy_when_done) + EMailForwardStyle style) { EActivity *activity; AsyncContext *async_context; @@ -2063,7 +2054,6 @@ em_utils_forward_messages (EMailReader *reader, async_context->reader = g_object_ref (reader); async_context->ptr_array = g_ptr_array_ref (uids); async_context->style = style; - async_context->destroy_when_done = destroy_when_done; switch (style) { case E_MAIL_FORWARD_STYLE_ATTACHED: |