GNOME.org
 

Exchange connector patches for gnome-2-8 branch

Hi,
There are 2 patches for exchange connector pending for the go ahead from the Gnome release team. I am attaching both the patches as well as the confirmation of the review done by the peer along with this mail. Please let us know if this fine to be committed to gnome-2-8 branch. [ Both the patches do not involve any string changes ] 

Thanks
-- Sarfraaz
--- Begin Message --- 
This patch was sets the window non modal so  that
user selection dialog gets the focus.

Thanks,
Sushma.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.139.2.18
diff -u -r1.139.2.18 ChangeLog
--- ChangeLog	14 Oct 2004 08:25:31 -0000	1.139.2.18
+++ ChangeLog	27 Oct 2004 05:30:31 -0000
@@ -1,3 +1,9 @@
+2004-10-26  Sushma Rai  <rsushma novell com>
+
+	* lib/e2k-user-dialog.c (addressbook_clicked_cb): Setting
+	the window non-modal, so that the user selection dialog
+	gets the focus. Fixes #65047
+
 2004-10-14  Frederic Crozat  <fcrozat mandrakesoft com>
 
 	* camel/camel-exchange-provider.c: (camel_provider_module_init):
Index: lib/e2k-user-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/lib/e2k-user-dialog.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 e2k-user-dialog.c
--- lib/e2k-user-dialog.c	11 May 2004 15:15:58 -0000	1.1.1.2
+++ lib/e2k-user-dialog.c	27 Oct 2004 05:30:32 -0000
@@ -124,6 +124,7 @@
 	E2kUserDialogPrivate *priv;
 	CORBA_Environment ev;
 
+	gtk_window_set_modal (GTK_WINDOW (dialog), FALSE);
 	priv = dialog->priv;
 
 	CORBA_exception_init (&ev);

--- End Message ---
--- Begin Message --- 
Looks fine ... and i guess you need this for Gnome 2.8 branch right ?

-- Sarfraaz

Sushma Rai wrote:


This patch was sets the window non modal so  that
user selection dialog gets the focus.

Thanks,
Sushma.


------------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.139.2.18
diff -u -r1.139.2.18 ChangeLog
--- ChangeLog	14 Oct 2004 08:25:31 -0000	1.139.2.18
+++ ChangeLog	27 Oct 2004 05:30:31 -0000
@@ -1,3 +1,9 @@
+2004-10-26  Sushma Rai  <rsushma novell com>
+
+	* lib/e2k-user-dialog.c (addressbook_clicked_cb): Setting
+	the window non-modal, so that the user selection dialog
+	gets the focus. Fixes #65047
+
2004-10-14  Frederic Crozat  <fcrozat mandrakesoft com>

	* camel/camel-exchange-provider.c: (camel_provider_module_init):
Index: lib/e2k-user-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/lib/e2k-user-dialog.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 e2k-user-dialog.c
--- lib/e2k-user-dialog.c	11 May 2004 15:15:58 -0000	1.1.1.2
+++ lib/e2k-user-dialog.c	27 Oct 2004 05:30:32 -0000
@@ -124,6 +124,7 @@
	E2kUserDialogPrivate *priv;
	CORBA_Environment ev;

+	gtk_window_set_modal (GTK_WINDOW (dialog), FALSE);
	priv = dialog->priv;

	CORBA_exception_init (&ev);


_______________________________________________
evolution-patches mailing list
evolution-patches lists ximian com
http://lists.ximian.com/mailman/listinfo/evolution-patches

--- End Message ---
--- Begin Message --- 
Hi,
This patch fixes the authentication problem for form-based-authentication on the exchange server. This is needed for the gnome-2-8 branch as well. 

Thanks
-- Sarfraaz

Index: storage/exchange-account.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-account.c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 exchange-account.c
--- storage/exchange-account.c	27 Aug 2004 15:31:49 -0000	1.18
+++ storage/exchange-account.c	3 Nov 2004 13:12:01 -0000
@@ -66,7 +66,7 @@ struct _ExchangeAccountPrivate {
 	gboolean uris_use_email;
 
 	char *identity_name, *identity_email, *source_uri, *password_key;
-	char *username, *password, *ad_server;
+	char *username, *password, *windows_domain, *ad_server;
 	E2kAutoconfigAuthPref auth_pref;
 	int ad_limit;
 
@@ -265,6 +265,9 @@ finalize (GObject *object)
 			strlen (account->priv->password));
 		g_free (account->priv->password);
 	}
+	if (account->priv->windows_domain)
+		g_free (account->priv->windows_domain);
+
 	if (account->priv->ad_server)
 		g_free (account->priv->ad_server);
 
@@ -959,6 +962,7 @@ exchange_account_connect (ExchangeAccoun
 	struct dirent *dent;
 	DIR *d;
 	char *old_password, *new_password;
+	char *user_name = NULL;
 
 	g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), NULL);
 
@@ -975,10 +979,18 @@ exchange_account_connect (ExchangeAccoun
 	account->priv->connecting = TRUE;
 	g_mutex_unlock (account->priv->connect_lock);
 
+	if (account->priv->windows_domain)
+		user_name = g_strdup_printf ("%s\\%s", account->priv->windows_domain, 
+							account->priv->username);
+	else
+		user_name = g_strdup (account->priv->username);
+
 	ac = e2k_autoconfig_new (account->home_uri,
 				 account->priv->username,
 				 NULL,
 				 account->priv->auth_pref);
+	g_free (user_name);
+
 	e2k_autoconfig_set_gc_server (ac, account->priv->ad_server,
 				      account->priv->ad_limit);
 
@@ -1508,6 +1520,12 @@ exchange_account_new (EAccountList *acco
 	account->priv->password_key = g_strdup_printf ("exchange://%s", account->priv->uri_authority);
 
 	account->priv->username = g_strdup (uri->user);
+
+	if (uri->domain)
+		account->priv->windows_domain = g_strdup (uri->domain);
+	else
+		account->priv->windows_domain = NULL;
+
 	account->exchange_server = g_strdup (uri->host);
 	if (uri->authmech && !strcmp (uri->authmech, "Basic"))
 		account->priv->auth_pref = E2K_AUTOCONFIG_USE_BASIC;

--- End Message ---
--- Begin Message --- 
Looks fine to me.

-Sushma.

On Wed, 2004-11-03 at 18:39, Sarfraaz Ahmed wrote:
> Hi,
> 
> This patch fixes the authentication problem for 
> form-based-authentication on the exchange server. This is needed for the 
> gnome-2-8 branch as well.
> 
> Thanks
>  -- Sarfraaz
> 
> ______________________________________________________________________
> Index: storage/exchange-account.c
> ===================================================================
> RCS file: /cvs/gnome/evolution-exchange/storage/exchange-account.c,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 exchange-account.c
> --- storage/exchange-account.c	27 Aug 2004 15:31:49 -0000	1.18
> +++ storage/exchange-account.c	3 Nov 2004 13:12:01 -0000
> @@ -66,7 +66,7 @@ struct _ExchangeAccountPrivate {
>  	gboolean uris_use_email;
>  
>  	char *identity_name, *identity_email, *source_uri, *password_key;
> -	char *username, *password, *ad_server;
> +	char *username, *password, *windows_domain, *ad_server;
>  	E2kAutoconfigAuthPref auth_pref;
>  	int ad_limit;
>  
> @@ -265,6 +265,9 @@ finalize (GObject *object)
>  			strlen (account->priv->password));
>  		g_free (account->priv->password);
>  	}
> +	if (account->priv->windows_domain)
> +		g_free (account->priv->windows_domain);
> +
>  	if (account->priv->ad_server)
>  		g_free (account->priv->ad_server);
>  
> @@ -959,6 +962,7 @@ exchange_account_connect (ExchangeAccoun
>  	struct dirent *dent;
>  	DIR *d;
>  	char *old_password, *new_password;
> +	char *user_name = NULL;
>  
>  	g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), NULL);
>  
> @@ -975,10 +979,18 @@ exchange_account_connect (ExchangeAccoun
>  	account->priv->connecting = TRUE;
>  	g_mutex_unlock (account->priv->connect_lock);
>  
> +	if (account->priv->windows_domain)
> +		user_name = g_strdup_printf ("%s\\%s", account->priv->windows_domain, 
> +							account->priv->username);
> +	else
> +		user_name = g_strdup (account->priv->username);
> +
>  	ac = e2k_autoconfig_new (account->home_uri,
>  				 account->priv->username,
>  				 NULL,
>  				 account->priv->auth_pref);
> +	g_free (user_name);
> +
>  	e2k_autoconfig_set_gc_server (ac, account->priv->ad_server,
>  				      account->priv->ad_limit);
>  
> @@ -1508,6 +1520,12 @@ exchange_account_new (EAccountList *acco
>  	account->priv->password_key = g_strdup_printf ("exchange://%s", account->priv->uri_authority);
>  
>  	account->priv->username = g_strdup (uri->user);
> +
> +	if (uri->domain)
> +		account->priv->windows_domain = g_strdup (uri->domain);
> +	else
> +		account->priv->windows_domain = NULL;
> +
>  	account->exchange_server = g_strdup (uri->host);
>  	if (uri->authmech && !strcmp (uri->authmech, "Basic"))
>  		account->priv->auth_pref = E2K_AUTOCONFIG_USE_BASIC;

--- End Message ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]