aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--src/filesel.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a81f4323..1bbfdd01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-28
+
+ * src/filesel.c: filesel_select_file_full(): don't execute automatic
+ incorporation while dialog is open.
+
2007-05-18
* version 2.4.2
diff --git a/ChangeLog.ja b/ChangeLog.ja
index f139788f..f9b9279d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2007-05-28
+
+ * src/filesel.c: filesel_select_file_full(): ダイアログが開いている
+ 間は自動受信を実行しないようにした。
+
2007-05-18
* version 2.4.2
diff --git a/src/filesel.c b/src/filesel.c
index 1b255f03..745ecd1f 100644
--- a/src/filesel.c
+++ b/src/filesel.c
@@ -31,6 +31,7 @@
#include "alertpanel.h"
#include "utils.h"
#include "prefs_common.h"
+#include "inc.h"
static GSList *filesel_select_file_full (const gchar *title,
const gchar *file,
@@ -125,6 +126,8 @@ static GSList *filesel_select_file_full(const gchar *title, const gchar *file,
change_dir(prev_dir);
g_free(prev_dir);
+ inc_lock();
+
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
if (list) {
@@ -136,6 +139,8 @@ static GSList *filesel_select_file_full(const gchar *title, const gchar *file,
}
}
+ inc_unlock();
+
if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
save_expander_expanded =
filesel_save_expander_get_expanded(dialog);