diff -u -r1.21 address-entry.c
--- libbalsa/address-entry.c	2002/02/07 10:00:11	1.21
+++ libbalsa/address-entry.c	2002/02/07 13:03:09
@@ -195,12 +195,10 @@
 libbalsa_address_entry_class_init(LibBalsaAddressEntryClass *klass)
 {
     GtkWidgetClass *gtk_widget_class;
-    GtkEntryClass *gtk_entry_class;
     GtkObjectClass *object_class;
 
     object_class = GTK_OBJECT_CLASS(klass);
     gtk_widget_class = GTK_WIDGET_CLASS(klass);
-    gtk_entry_class = GTK_ENTRY_CLASS(klass);
     parent_class = gtk_type_class(GTK_TYPE_ENTRY);
 
     object_class->destroy = libbalsa_address_entry_destroy;
@@ -965,7 +963,7 @@
 
         /* now draw the cursor (there's no method specifically for that,
          * but draw_focus includes the cursor) */
-        GTK_WIDGET_CLASS(parent_class)->draw_focus(widget);
+        gtk_widget_draw_focus(widget);
     }
 }
 
@@ -1024,7 +1022,7 @@
     /*
      * Check if it is mouse button 2 (paste text)
      */
-    if ( (event->button == 2) && (event->type != GDK_BUTTON_PRESS) &&
+    if ( (event->button == 2) && (event->type == GDK_BUTTON_PRESS) &&
 	 editable->editable )
     {
 	if (address_entry->input != NULL)
@@ -1463,7 +1461,6 @@
 {
     inputData *input;
     emailData *addy, *extra;
-    GList *list;
     gchar *left, *right, *str;
     
     g_return_if_fail(address_entry != NULL);
@@ -1496,11 +1493,7 @@
      * Now we add a new entry.
      */
     extra = libbalsa_emailData_new();
-    list = g_list_next(input->active);
-    if (list == NULL)
-	g_list_append(input->list, extra);
-    else
-	g_list_insert(input->list, extra, g_list_position(input->list, list));
+    g_list_insert(input->active, extra, 1);
     if (right != NULL) {
 	extra->user = g_strdup(right);
 	str = g_strndup(left, addy->cursor);
