From: Andrej Kacian <ticho@claws-mail.org>
Date: Wed, 12 Dec 2012 12:43:53 +0000 (+0000)
Subject: 2012-12-12 [ticho]	3.9.0cvs46
X-Git-Tag: 3.9.1~157
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7f17fbf6defe51b592f60760c4d70b50871b5efb

2012-12-12 [ticho]	3.9.0cvs46

	* src/compose.c
		Move focus to body textview when subject entry is activated
		(Enter key pressed) in compose window.
---

diff --git a/ChangeLog b/ChangeLog
index 19432cfbc..ab44bbe6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-12 [ticho]	3.9.0cvs46
+
+	* src/compose.c
+		Move focus to body textview when subject entry is activated
+		(Enter key pressed) in compose window.
+
 2012-12-10 [mones]	3.9.0cvs45
 
 	* src/addr_compl.c
diff --git a/PATCHSETS b/PATCHSETS
index 1d10ead0b..69c5fec74 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4543,3 +4543,4 @@
 ( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 tools/README;  cvs diff -u -r 1.1 -r 1.2 tools/gif2xface.pl;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/outlook2claws-mail.pl;  ) > 3.9.0cvs43.patchset
 ( cvs diff -u -r 1.101.2.75 -r 1.101.2.76 src/news.c;  ) > 3.9.0cvs44.patchset
 ( cvs diff -u -r 1.27.2.66 -r 1.27.2.67 src/addr_compl.c;  ) > 3.9.0cvs45.patchset
+( cvs diff -u -r 1.382.2.618 -r 1.382.2.619 src/compose.c;  ) > 3.9.0cvs46.patchset
diff --git a/configure.ac b/configure.ac
index fa54857d3..d9ff25891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index ac7614c05..f351d8fb2 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -557,6 +557,7 @@ static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
 static void compose_attach_update_label(Compose *compose);
 static void compose_set_folder_prefs(Compose *compose, FolderItem *folder,
 				     gboolean respect_default_to);
+static void compose_subject_entry_activated(GtkWidget *widget, gpointer data);
 
 static GtkActionEntry compose_popup_entries[] =
 {
@@ -7672,7 +7673,9 @@ static Compose *compose_create(PrefsAccount *account,
 			 G_CALLBACK(compose_popup_menu), compose);
 #endif
 	g_signal_connect(G_OBJECT(subject_entry), "changed",
-			 G_CALLBACK(compose_changed_cb), compose);
+			G_CALLBACK(compose_changed_cb), compose);
+	g_signal_connect(G_OBJECT(subject_entry), "activate",
+			G_CALLBACK(compose_subject_entry_activated), compose);
 
 	/* drag and drop */
 	gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 
@@ -11647,6 +11650,15 @@ static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
 }
 #endif
 
+static void compose_subject_entry_activated(GtkWidget *widget, gpointer data)
+{
+	Compose *compose = (Compose *)data;
+
+	cm_return_if_fail(compose != NULL);
+
+	gtk_widget_grab_focus(compose->text);
+}
+
 /*
  * End of Source.
  */