aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2009-06-10 02:04:11 +0800
committerSrinivasa Ragavan <sragavan@novell.com>2009-06-10 02:08:58 +0800
commitf7c4da545938f98cdedd552e50b1dd814050213e (patch)
treea62cf95e6fba11d02daaaed25469ed9b16c0febf
parentba0128107cd7cd4edc98b379ebc6b35cccf6dc0b (diff)
downloadgsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar.gz
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar.bz2
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar.lz
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar.xz
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.tar.zst
gsoc2013-evolution-f7c4da545938f98cdedd552e50b1dd814050213e.zip
** BUGFIX: #584733 - Fixed where account setup to work after Anjal merge
* em-account-editor.c: fixed where a memory corruption, invalid read was happening.
-rw-r--r--mail/em-account-editor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index bce0bbb469..a9d0fccd39 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1421,7 +1421,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
current[len] = 0;
}
} else {
- current = (gchar*)"imap";
+ current = (gchar *)"imap";
}
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
@@ -2687,8 +2687,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
@@ -2772,7 +2770,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;
@@ -2801,10 +2799,13 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data)
camel_url_set_host (url, "");
}
camel_url_set_user (url, user);
+ g_free (uri);
uri = camel_url_to_string(url, 0);
e_account_set_string(emae->account, E_ACCOUNT_SOURCE_URL, uri);
g_free(uri);
camel_url_free(url);
+ } else {
+ g_free(uri);
}
}