Index: editing.c
===================================================================
RCS file: /cvs/gpe/base/gpe-contacts/editing.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -b -B -u -r1.37 -r1.38
--- editing.c	6 Aug 2004 11:06:51 -0000	1.37
+++ editing.c	17 Aug 2004 16:19:49 -0000	1.38
@@ -82,6 +82,7 @@
               g_signal_connect(G_OBJECT(l),"clicked",
                                G_CALLBACK(on_name_clicked),
                                gtk_widget_get_toplevel(pw));
+              GTK_WIDGET_SET_FLAGS(w,GTK_CAN_DEFAULT);
             }
           gtk_table_attach (GTK_TABLE (table),
                     l,
@@ -545,8 +546,15 @@
           if (v && v->value)
             {
               if (GTK_IS_EDITABLE (w))
+                {
                 gtk_editable_insert_text (GTK_EDITABLE (w), v->value,
                           strlen (v->value), &pos);
+                  if (!strcasecmp(v->tag,"NAME"))
+                    {
+                      gtk_widget_grab_default(w);
+                      gtk_widget_grab_focus(w);
+                    }
+                }
               else if (GTK_IS_DATE_COMBO(w))
                 {
                   if (v->value)