aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-10-14 00:50:20 +0800
committerMilan Crha <mcrha@redhat.com>2009-10-14 00:50:20 +0800
commit51f9daed7077c6b7f616c92ee86459a02f63bc16 (patch)
treefc90f9fc414920475768bec8ed2b973a8456a0bf /composer/e-msg-composer.c
parent2efaad9c77b988b9d64256ff65976b2b5fe255cb (diff)
downloadgsoc2013-evolution-51f9daed7077c6b7f616c92ee86459a02f63bc16.tar.gz
gsoc2013-evolution-51f9daed7077c6b7f616c92ee86459a02f63bc16.tar.zst
gsoc2013-evolution-51f9daed7077c6b7f616c92ee86459a02f63bc16.zip
Bug #597123 - Composer's Send Options doesn't work
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c62
1 files changed, 1 insertions, 61 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index bc1ce20dd6..6f4aee2ff7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1353,7 +1353,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer)
ESignature *signature;
EAccount *account;
gboolean active;
- gboolean sensitive;
const gchar *uid;
table = e_msg_composer_get_header_table (composer);
@@ -1380,57 +1379,11 @@ msg_composer_account_changed_cb (EMsgComposer *composer)
signature = uid ? e_get_signature_by_uid (uid) : NULL;
e_composer_header_table_set_signature (table, signature);
- /* XXX This should be done more generically. The composer
- * should not know about particular account types. */
- sensitive =
- (strstr (account->transport->url, "exchange") != NULL) ||
- (strstr (account->transport->url, "groupwise") != NULL);
- gtk_action_set_sensitive (ACTION (SEND_OPTIONS), sensitive);
-
-exit:
+ exit:
e_msg_composer_show_sig_file (composer);
}
-static void
-msg_composer_account_list_changed_cb (EMsgComposer *composer)
-{
- EComposerHeaderTable *table;
- EAccountList *account_list;
- EIterator *iterator;
- gboolean visible = FALSE;
-
- /* Determine whether to show the "send-options" action by
- * examining the account list for account types that support it.
- *
- * XXX I'd prefer a more general way of doing this. The composer
- * should not know about particular account types. Perhaps
- * add a "supports advanced send options" flag to EAccount. */
-
- table = E_COMPOSER_HEADER_TABLE (composer->priv->header_table);
- account_list = e_composer_header_table_get_account_list (table);
- iterator = e_list_get_iterator (E_LIST (account_list));
-
- while (!visible && e_iterator_is_valid (iterator)) {
- EAccount *account;
- const gchar *url;
-
- /* XXX EIterator misuses const. */
- account = (EAccount *) e_iterator_get (iterator);
- e_iterator_next (iterator);
-
- if (!account->enabled)
- continue;
-
- url = account->transport->url;
- visible |= (strstr (url, "exchange") != NULL);
- visible |= (strstr (url, "groupwise") != NULL);
- }
-
- gtk_action_set_visible (ACTION (SEND_OPTIONS), visible);
- g_object_unref (iterator);
-}
-
struct _drop_data {
EMsgComposer *composer;
@@ -2138,9 +2091,6 @@ msg_composer_init (EMsgComposer *composer)
table, "notify::account",
G_CALLBACK (msg_composer_account_changed_cb), composer);
g_signal_connect_swapped (
- table, "notify::account-list",
- G_CALLBACK (msg_composer_account_list_changed_cb), composer);
- g_signal_connect_swapped (
table, "notify::destinations-bcc",
G_CALLBACK (msg_composer_notify_header_cb), composer);
g_signal_connect_swapped (
@@ -2163,7 +2113,6 @@ msg_composer_init (EMsgComposer *composer)
G_CALLBACK (msg_composer_notify_header_cb), composer);
msg_composer_account_changed_cb (composer);
- msg_composer_account_list_changed_cb (composer);
/* Attachments */
@@ -3991,15 +3940,6 @@ e_msg_composer_get_attachment_view (EMsgComposer *composer)
return E_ATTACHMENT_VIEW (composer->priv->attachment_paned);
}
-void
-e_msg_composer_set_send_options (EMsgComposer *composer,
- gboolean send_enable)
-{
- g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
- composer->priv->send_invoked = send_enable;
-}
-
GList *
e_load_spell_languages (void)
{