evolution r35657 - trunk/plugins/groupwise-features

[psankar svn gnome org]

Author: psankar
Date: Fri Jun 20 10:45:46 2008
New Revision: 35657
URL: http://svn.gnome.org/viewvc/evolution?rev=35657&view=rev

Log:
2008-06-20  Sankar P  <psankar novell com>

	* mail-retract.c (retract_mail_settings):
	Multiple open dialogs is an usability issue
	and a potential HIG violation. 
	Thanks to Akhil for pointing out.




Modified:
   trunk/plugins/groupwise-features/ChangeLog
   trunk/plugins/groupwise-features/mail-retract.c

Modified: trunk/plugins/groupwise-features/mail-retract.c
==============================================================================
--- trunk/plugins/groupwise-features/mail-retract.c	(original)
+++ trunk/plugins/groupwise-features/mail-retract.c	Fri Jun 20 10:45:46 2008
@@ -43,6 +43,7 @@
 	CamelStore *store = folder->parent_store;
 	char *id;
 	GtkWidget *confirm_dialog, *confirm_warning;
+	int n;
 
 	cnc = get_cnc (store);
 
@@ -62,7 +63,12 @@
 		gtk_widget_set_size_request (confirm_dialog, 400, 100);
 		gtk_widget_show_all (confirm_dialog);
 
-		if (gtk_dialog_run (GTK_DIALOG (confirm_dialog)) == GTK_RESPONSE_YES) {
+		n =gtk_dialog_run (GTK_DIALOG (confirm_dialog));
+
+		gtk_widget_destroy (confirm_warning);
+		gtk_widget_destroy (confirm_dialog);
+
+		if (n == GTK_RESPONSE_YES) {
 
 			if (e_gw_connection_retract_request (cnc, id, NULL, FALSE, FALSE) != E_GW_CONNECTION_STATUS_OK )
 				e_error_run (NULL, "org.gnome.evolution.message.retract:retract-failure", NULL);
@@ -72,10 +78,7 @@
 				gtk_dialog_run (GTK_DIALOG(dialog));
 				gtk_widget_destroy (dialog);
 			}
-		}
-
-		gtk_widget_destroy (confirm_warning);
-		gtk_widget_destroy (confirm_dialog);
+		} 
 	}
 }