evolution-mapi r39 - trunk/src/account-setup-eplugin
- From: mcrha svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-mapi r39 - trunk/src/account-setup-eplugin
- Date: Fri, 19 Dec 2008 11:42:20 +0000 (UTC)
Author: mcrha
Date: Fri Dec 19 11:42:20 2008
New Revision: 39
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=39&view=rev
Log:
2008-12-19 Milan Crha <mcrha redhat com>
** Fix for bug #564901
* exchange-mapi-account-setup.c:
(org_gnome_exchange_mapi_account_setup): 'url' is NULL on a New Account
creation, thus count with it. Also fill the 'Domain' entry on editing.
Modified:
trunk/src/account-setup-eplugin/ChangeLog
trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c
Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c (original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c Fri Dec 19 11:42:20 2008
@@ -310,12 +310,15 @@
target_account = (EMConfigTargetAccount *)data->config->target;
url = camel_url_new(e_account_get_string(target_account->account, E_ACCOUNT_SOURCE_URL), NULL);
- g_return_val_if_fail (url != NULL, NULL);
+ /* is NULL on New Account creation */
+ if (url == NULL)
+ return NULL;
if (!g_ascii_strcasecmp (url->protocol, "mapi")) {
GtkWidget *label;
GtkWidget *domain_name;
GtkWidget *auth_button;
+ const char *domain_value = camel_url_get_param (url, "domain");
int row = ((GtkTable *)data->parent)->nrows;
/* Domain name & Authenticate Button */
@@ -325,6 +328,8 @@
domain_name = gtk_entry_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), domain_name);
+ if (domain_value && *domain_value)
+ gtk_entry_set_text (GTK_ENTRY (domain_name), domain_value);
gtk_box_pack_start (GTK_BOX (hbox), domain_name, FALSE, FALSE, 0);
g_signal_connect (domain_name, "changed", G_CALLBACK(domain_entry_changed), data->config);
@@ -338,7 +343,7 @@
}
camel_url_free (url);
- return GTK_WIDGET (hbox);
+ return hbox;
}
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]