diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-20 07:05:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-20 07:05:26 +0800 |
| commit | c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06 (patch) | |
| tree | 0511fb4033ea74c0bc0c26aad4594868d78277a8 /mail | |
| parent | f4d748a85c534cb8a693b6a1f1b3353adfd73b5b (diff) | |
| parent | ed2d22755ff21516e3284f38eefd080102dd3715 (diff) | |
| download | gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.gz gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.zst gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.zip | |
Merge commit 'EVOLUTION_2_27_3' into kill-bonobo
Conflicts:
composer/e-composer-header-table.h
composer/e-composer-header.c
composer/e-composer-private.c
configure.ac
mail/em-account-editor.c
po/POTFILES.in
po/or.po
widgets/misc/e-search-bar.c
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-account-editor.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 01f8b9c733..5179815609 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2707,8 +2707,6 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) { if (url->host == NULL || url->host[0] == 0) ok = FALSE; - else - gtk_entry_set_text(service->hostname, url->host); } /* We only need the user if the service needs auth as well, i think */ if (ok @@ -2792,7 +2790,7 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data) if (!emae->priv->receive_set) { gchar *user, *at; gint index; - gchar *uri = (gchar *)e_account_get_string(emae->account, E_ACCOUNT_SOURCE_URL); + gchar *uri = g_strdup(e_account_get_string(emae->account, E_ACCOUNT_SOURCE_URL)); CamelURL *url; emae->priv->receive_set = 1; @@ -2819,8 +2817,6 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data) g_free(uri); camel_url_free(url); - } else { - g_warning("buz1\n"); } } |