Simplify focus to subject entry code.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4cb88b3a003028c77f3c9df5fd8a0b9e87a856d9..388222a74ef5437c13eaf0bf74f7be8d037632fa 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-27 [melvin]    0.6.6claws27
+       
+       * src/compose.c
+               Simplify focus to subject entry code.
+
 2001-12-27 [darko]     0.6.6claws26
 
        * src/filtering.c

diff --git a/configure.in b/configure.in
index 4905c1e42ee62710a46a903f3e5c5a10e1b5f59f..c2f1f3e746ce043104d6368261bbd5ea6e1e8b48 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws27
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index d011e7f1541ca27329571cfe71fc349aa1e1a54e..bf046ad1d7bb8309a929180e612ad040b6a01c28 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -426,10 +426,6 @@ void compose_headerentry_key_press_event_cb(GtkWidget             *entry,
                                            GdkEventKey        *event,
                                            ComposeHeaderEntry *headerentry);
 
-gint compose_headerentry_key_press_event_tab_cb        (GtkWidget          *entry,
-                                                GdkEventKey        *event,
-                                                ComposeHeaderEntry *headerentry);
-
 static void compose_show_first_last_header(Compose *compose, gboolean show_first);
 
 static GtkItemFactoryEntry compose_popup_entries[] =
@@ -3815,7 +3811,6 @@ static void compose_create_header_entry(Compose *compose)
 
        address_completion_register_entry(GTK_ENTRY(entry));
 
-        gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_tab_cb), headerentry);
         headerentry->compose = compose;
         headerentry->combo = combo;
         headerentry->entry = entry;
@@ -6264,7 +6259,16 @@ void compose_headerentry_key_press_event_cb(GtkWidget *entry,
                        g_slist_remove(headerentry->compose->header_list,
                                       headerentry);
                g_free(headerentry);
+       } else  if (event->keyval == GDK_Tab) {
+               if (headerentry->compose->header_last == headerentry) {
+                       /* Override default next focus, and give it to subject_entry
+                        * instead of notebook tabs
+                        */
+                       gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event"); 
+                       gtk_widget_grab_focus(headerentry->compose->subject_entry);
+               }
        }
+
 }
 
 void compose_headerentry_changed_cb(GtkWidget *entry,
@@ -6285,23 +6289,6 @@ void compose_headerentry_changed_cb(GtkWidget *entry,
        }
 }
 
-gint compose_headerentry_key_press_event_tab_cb(GtkWidget         *entry,
-                                               GdkEventKey        *event,
-                                               ComposeHeaderEntry *headerentry)
-{
-       if (event->keyval == GDK_Tab) {
-               if (headerentry->compose->header_last == headerentry) {
-                       /* Override default next focus, and give it to subject_entry
-                        * instead of notebook tabs
-                        */
-                       gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event"); 
-                       gtk_widget_grab_focus(headerentry->compose->subject_entry);
-                       return TRUE;
-               }
-       }
-       return FALSE;
-}
-
 static void compose_show_first_last_header(Compose *compose, gboolean show_first)
 {
        GtkAdjustment *vadj;