seahorse r2891 - in trunk: . gkr

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Mar  7 05:23:06 2009
New Revision: 2891
URL: http://svn.gnome.org/viewvc/seahorse?rev=2891&view=rev

Log:
Fix cancel button in add keyring dialog.
Fixes bug #574424

Modified:
   trunk/ChangeLog
   trunk/gkr/seahorse-gkr-add-keyring.c

Modified: trunk/gkr/seahorse-gkr-add-keyring.c
==============================================================================
--- trunk/gkr/seahorse-gkr-add-keyring.c	(original)
+++ trunk/gkr/seahorse-gkr-add-keyring.c	Sat Mar  7 05:23:06 2009
@@ -153,10 +153,8 @@
 	
 	if (response == GTK_RESPONSE_HELP) {
 		seahorse_widget_show_help (swidget);
-		return;
-	}
-
-	if (response == GTK_RESPONSE_ACCEPT) {
+		
+	} else if (response == GTK_RESPONSE_ACCEPT) {
 	    
 		entry = GTK_ENTRY (seahorse_widget_get_widget (swidget, "keyring-name"));
 		g_return_if_fail (entry); 
@@ -167,6 +165,9 @@
 		request = gnome_keyring_create (keyring, NULL, keyring_add_done, g_object_ref (swidget), g_object_unref);
 		g_return_if_fail (request);
 		setup_request (swidget, request);
+		
+	} else {
+		seahorse_widget_destroy (swidget);
 	}
 }