From 54f502253d9400809e0aa910859d04f076f5d8f2 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 27 Sep 2002 06:48:50 +0000
Subject: [PATCH] sync with 0.8.3cvs8

---
 ChangeLog       | 6 ++++++
 ChangeLog.claws | 5 +++++
 ChangeLog.jp    | 5 +++++
 configure.in    | 2 +-
 src/compose.c   | 4 ----
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 19a8a572b..c23b34148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-27
+
+	* src/compose.c: compose_new(): removed the workaround for XIM
+	  because it doesn't have any effect and only seems to cause
+	  hangs.
+
 2002-09-26
 
 	* src/compose.[ch]: compose_reply(): added a flag for reply-to-ML.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7ebe4dcd1..86d267572 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-09-27 [paul]	0.8.3claws28
+
+	* sync with 0.8.3cvs8
+		see ChangeLog 2002-09-27
+
 2002-09-26 [colin]	0.8.3claws27
 
 	* src/toolbar.[ch]
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 7ad23ac01..fd62a3692 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-09-27
+
+	* src/compose.c: compose_new(): ¸ú²Ì¤¬Ìµ¤¯¡¢¥Ï¥ó¥°¤ò°ú¤­µ¯¤³¤¹¤À¤±
+	  ¤Ç¤¢¤ë¤¿¤á XIM ¤Î workaround ¤òºï½ü¡£
+
 2002-09-26
 
 	* src/compose.[ch]: compose_reply(): ML ¤Ø¤ÎÊÖ¿®ÍѤΥե饰¤òÄɲá£
diff --git a/configure.in b/configure.in
index 8f9385772..069382a5d 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws27
+EXTRA_VERSION=claws28
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 8cd94d21e..40619ba51 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -725,10 +725,6 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 
 	gtk_stext_thaw(text);
 
-	/* workaround for initial XIM problem */
-	gtk_widget_grab_focus(compose->text);
-	gtkut_widget_wait_for_draw(compose->text);
-
 	if (account->protocol != A_NNTP) {
 		if (mailto && *mailto != '\0') {
 			compose_entries_set(compose, mailto);
-- 
2.25.1