aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--src/main.c4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9855b68c..69354cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-03-29
+ * src/main.c: app_will_exit(): force process termination (fixes
+ unable to exit sylpheed in some case).
+
+2007-03-29
+
* src/inc.c
src/main.c: disable --compose, --receive, --send remote commands
when a modal dialog exists.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 0a261e20..90daf3a6 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
2007-03-29
+ * src/main.c: app_will_exit(): 強制的にプロセスを終了するように
+ した(特定のケースで sylpheed が終了できなくなるのを修正)。
+
+2007-03-29
+
* src/inc.c
src/main.c: モーダルダイアログが存在する場合は --compose,
--receive, --send リモートコマンドを無効にした。
diff --git a/src/main.c b/src/main.c
index 04020cd0..129a17aa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -705,6 +705,8 @@ void app_will_exit(gboolean force)
if (gtk_main_level() > 0)
gtk_main_quit();
+
+ exit(0);
}
#if 0
@@ -1101,6 +1103,7 @@ static gboolean lock_socket_input_cb(GIOChannel *source, GIOCondition condition,
g_free(status);
if (folders) g_ptr_array_free(folders, TRUE);
} else if (!strncmp(buf, "exit", 4)) {
+ fd_close(sock);
app_will_exit(TRUE);
}
@@ -1153,7 +1156,6 @@ static void remote_command_exec(void)
}
if (cmd.exit) {
app_will_exit(TRUE);
- exit(0);
}
}