2006-04-14 [colin] 2.1.0cvs47

	* src/main.c
		Fix race on --select (should be done better)

diff --git a/ChangeLog b/ChangeLog
index 173fc7095a6c1f41a4b4f76e85baeffa58277e3b..d343e0caf43bec82d625d76bcf1daabff3a6de43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14 [colin]     2.1.0cvs47
+
+       * src/main.c
+               Fix race on --select (should be done better)
+
 2006-04-14 [wwp]       2.1.0cvs46
 
        * src/send_message.c

diff --git a/PATCHSETS b/PATCHSETS
index df399c08e2fd99bff37dfe481c7775c531000ccf..a6c2e9af00cf7a15cf455d3241d694888791ae66 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1418,3 +1418,4 @@
 ( cvs diff -u -r 1.382.2.263 -r 1.382.2.264 src/compose.c;  ) > 2.1.0cvs44.patchset
 ( cvs diff -u -r 1.65.2.47 -r 1.65.2.48 src/codeconv.c;  ) > 2.1.0cvs45.patchset
 ( cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/send_message.c;  ) > 2.1.0cvs46.patchset
+( cvs diff -u -r 1.115.2.79 -r 1.115.2.80 src/main.c;  ) > 2.1.0cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 5145c3645f5770f02dd89046c6839674090afc35..e7d7d1e86acd4acacb9bf9e65b3016546f0032dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 8c009ec07e8a343eb2f1f0573f89de0db28c5090..f78b9880afcbbc09f12ea1e7b59ea8505e61af2e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -253,6 +253,13 @@ gboolean defer_check(void *data)
        return FALSE;
 }
 
+static gboolean defer_jump(void *data)
+{
+       const char *target = (const char *)data;
+       mainwindow_jump_to(data);
+       return FALSE;
+}
+
 static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
 {
        gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
@@ -576,7 +583,7 @@ int main(int argc, char *argv[])
        }
        
        if (cmd.target) {
-               mainwindow_jump_to(cmd.target);
+               g_timeout_add(500, defer_jump, cmd.target);
        }
 
        gtk_main();