gnome-keyring r1636 - in trunk: . gcr

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb 28 03:20:13 2009
New Revision: 1636
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1636&view=rev

Log:
Some changes to the import dialog.

Modified:
   trunk/ChangeLog
   trunk/gcr/gcr-import-dialog.c

Modified: trunk/gcr/gcr-import-dialog.c
==============================================================================
--- trunk/gcr/gcr-import-dialog.c	(original)
+++ trunk/gcr/gcr-import-dialog.c	Sat Feb 28 03:20:13 2009
@@ -44,6 +44,7 @@
 struct _GcrImportDialogPrivate {
 	GtkBuilder *builder;
 	EggSecureEntry *entry;
+	GtkWidget *button;
 	GtkComboBox *combo;
 	GtkListStore *slots;
 };
@@ -149,7 +150,10 @@
 
 	/* Add our various buttons */
 	gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
+	self->pv->button = gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+	
+	_gcr_import_dialog_show_password (self);
 	
 	return G_OBJECT (self);
 }
@@ -397,7 +401,8 @@
 {
 	g_return_if_fail (GCR_IS_IMPORT_DIALOG (self));
 	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "password-label")));
-	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "password-area")));	
+	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "password-area")));
+	gtk_widget_grab_focus (GTK_WIDGET (self->pv->entry));
 }
 
 void
@@ -406,6 +411,7 @@
 	g_return_if_fail (GCR_IS_IMPORT_DIALOG (self));
 	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "password-label")));
 	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "password-area")));
+	gtk_widget_grab_focus (self->pv->button);
 }
 
 const gchar*