[evolution-patches] Exchange connector: Patch for #73218, name selection dialog

[Sushma Rai <rsushma novell com>]

Hi,

This is the fix for failure during subscribing to other user's 
folders.

Please review,
Sushma.




Index: shell/e-folder-misc-dialogs.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/shell/e-folder-misc-dialogs.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-folder-misc-dialogs.c
--- shell/e-folder-misc-dialogs.c	4 Feb 2005 10:20:27 -0000	1.4
+++ shell/e-folder-misc-dialogs.c	5 Mar 2005 08:57:48 -0000
@@ -274,6 +274,7 @@ user_clicked (GtkWidget *button, ENameSe
 	ENameSelectorDialog *name_selector_dialog;
 
 	name_selector_dialog = e_name_selector_peek_dialog (name_selector);
+	gtk_window_set_modal (GTK_WINDOW (name_selector_dialog), TRUE);
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
@@ -307,6 +308,7 @@ setup_name_selector (GladeXML *glade_xml
 	button = glade_xml_get_widget (glade_xml, "button-user");
 	g_signal_connect (button, "clicked", G_CALLBACK (user_clicked), name_selector);
 
+	gtk_box_pack_start (GTK_BOX (placeholder), widget, TRUE, TRUE, 6);
 	*name_selector_ret = name_selector;
 
 	return widget;
@@ -391,7 +393,7 @@ do_foreign_folder_dialog (EStorageSetVie
 	GtkWidget *dialog;
 	GtkWidget *name_selector_widget;
 	GtkWidget *folder_name_entry;
-	char *user_email_address;
+	const char *user_email_address = NULL;
 	int response;
 
 	glade_xml = glade_xml_new (CONNECTOR_GLADEDIR "/e-foreign-folder-dialog.glade",
@@ -424,22 +426,20 @@ do_foreign_folder_dialog (EStorageSetVie
 			return FALSE;
 		}
 
-		bonobo_widget_get_property (BONOBO_WIDGET (name_selector_widget),
-					    "addresses", TC_CORBA_string, &user_email_address,
-					    NULL);
+		user_email_address = gtk_entry_get_text (GTK_ENTRY (name_selector_widget));
 
 		if (user_email_address != NULL && *user_email_address != '\0')
 			break;
 
-		g_free (user_email_address);
-
 		/* It would be nice to insensitivize the OK button appropriately
 		   instead of doing this, but unfortunately we can't do this for the
 		   Bonobo control.  */
 		e_notice (dialog, GTK_MESSAGE_ERROR, _("Please select a user."));
 	}
+	gtk_widget_show_all (dialog);
 
-	*user_email_address_return = user_email_address;
+	if (user_email_address)
+		*user_email_address_return = g_strdup (user_email_address);
 	*folder_name_return = g_strdup (gtk_entry_get_text (GTK_ENTRY (folder_name_entry)));
 
 	gtk_widget_destroy (dialog);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.282
diff -u -r1.282 ChangeLog
--- ChangeLog	3 Mar 2005 04:01:13 -0000	1.282
+++ ChangeLog	5 Mar 2005 08:57:55 -0000
@@ -1,4 +1,15 @@
+2005-03-05  Sushma Rai  <rsushma novell com>
+
+	* shell/e-folder-misc-dialogs.c (do_foreign_folder_dialog): Removed the
+	corba method which was still being used to retrieve user's e-mail 
+	address.
+	(user_clicked): Making name selector dialog modal.
+	(setup_name_selector): Adding the user name entry widget to the name 
+	selector dialog.
+	Fixes #73218
+
 2005-03-03  Rajesh Ranjan <rranjan redhat com>
+
 	* configure.in : Added hi to ALL_LINGUAS.
 
 2005-02-28  Sarfraaz Ahmed <asarfraaz novell com>