aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--libsylph/imap.c47
-rw-r--r--libsylph/utils.c2
-rw-r--r--libsylph/utils.h2
-rw-r--r--src/folderview.c6
6 files changed, 53 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index c708a423..c4fccfe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-09-07
+ * libsylph/utils.[ch]: renamed print_status() to status_print().
+ * libsylph/imap.c: adjusted the frequency of UI update.
+ * src/folderview.c: don't allow selection if summary is locked.
+
+2005-09-07
+
* libsylph/codeconv.c: conv_guess_ja_encoding(): also support UTF-8
encoding.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 11c49f8b..3b4029d6 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2005-09-07
+ * libsylph/utils.[ch]: print_status() を status_print() に変更。
+ * libsylph/imap.c: UI 更新の頻度を調整。
+ * src/folderview.c: サマリがロックされている場合は選択不可にした。
+
+2005-09-07
+
* libsylph/codeconv.c: conv_guess_ja_encoding(): UTF-8 エンコー
ディングにも対応。
diff --git a/libsylph/imap.c b/libsylph/imap.c
index 65defd10..cf83f884 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -1089,6 +1089,7 @@ static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
return NULL;
}
+ status_print("Getting message %d", uid);
debug_print("getting message %d...\n", uid);
ok = imap_cmd_fetch(session, (guint32)uid, filename);
@@ -1152,6 +1153,7 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
gint count = 1;
gint total;
gint ok;
+ GTimeVal tv_prev, tv_cur;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
@@ -1160,6 +1162,7 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
session = imap_session_get(folder);
if (!session) return -1;
+ g_get_current_time(&tv_prev);
ui_update();
ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
@@ -1199,7 +1202,16 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
dest->stype == F_TRASH)
iflags |= IMAP_FLAG_SEEN;
- print_status(_("Appending messages (%d / %d)"), count++, total);
+ g_get_current_time(&tv_cur);
+ if (tv_cur.tv_sec > tv_prev.tv_sec ||
+ tv_cur.tv_usec - tv_prev.tv_usec >
+ PROGRESS_UPDATE_INTERVAL * 1000) {
+ status_print(_("Appending messages to %s (%d / %d)"),
+ dest->path, count, total);
+ ui_update();
+ tv_prev = tv_cur;
+ }
+ ++count;
ok = imap_cmd_append(session, destdir, fileinfo->file, iflags,
&new_uid);
@@ -1279,17 +1291,17 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, GSList *msglist,
gchar *seq_set = (gchar *)cur->data;
if (remove_source) {
- print_status(_("Moving messages %s to %s ..."),
- seq_set, destdir);
+ status_print(_("Moving messages %s to %s ..."),
+ seq_set, dest->path);
debug_print("Moving message %s%c[%s] to %s ...\n",
src->path, G_DIR_SEPARATOR,
- seq_set, destdir);
+ seq_set, dest->path);
} else {
- print_status(_("Copying messages %s to %s ..."),
- seq_set, destdir);
+ status_print(_("Copying messages %s to %s ..."),
+ seq_set, dest->path);
debug_print("Copying message %s%c[%s] to %s ...\n",
src->path, G_DIR_SEPARATOR,
- seq_set, destdir);
+ seq_set, dest->path);
}
ui_update();
@@ -1432,7 +1444,7 @@ static gint imap_remove_msgs_by_seq_set(Folder *folder, FolderItem *item,
for (cur = seq_list; cur != NULL; cur = cur->next) {
gchar *seq_set = (gchar *)cur->data;
- print_status(_("Removing messages %s"), seq_set);
+ status_print(_("Removing messages %s"), seq_set);
ui_update();
ok = imap_set_message_flags(session, seq_set, IMAP_FLAG_DELETED,
@@ -1529,7 +1541,7 @@ static gint imap_remove_all_msg(Folder *folder, FolderItem *item)
if (ok != IMAP_SUCCESS)
return ok;
- print_status(_("Removing all messages in %s"), item->path);
+ status_print(_("Removing all messages in %s"), item->path);
ui_update();
imap_cmd_gen_send(session, "STORE 1:* +FLAGS.SILENT (\\Deleted)");
@@ -2253,6 +2265,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
MsgInfo *msginfo;
gchar seq_set[22];
gint count = 1;
+ GTimeVal tv_prev, tv_cur;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
@@ -2260,6 +2273,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
g_return_val_if_fail(FOLDER_TYPE(item->folder) == F_IMAP, NULL);
g_return_val_if_fail(first_uid <= last_uid, NULL);
+ g_get_current_time(&tv_prev);
ui_update();
if (first_uid == 0 && last_uid == 0)
@@ -2275,9 +2289,18 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
str = g_string_new(NULL);
for (;;) {
- if (exists > 0)
- print_status(_("Getting message headers (%d / %d)"),
- count, exists);
+ if (exists > 0) {
+ g_get_current_time(&tv_cur);
+ if (tv_cur.tv_sec > tv_prev.tv_sec ||
+ tv_cur.tv_usec - tv_prev.tv_usec >
+ PROGRESS_UPDATE_INTERVAL * 1000) {
+ status_print
+ (_("Getting message headers (%d / %d)"),
+ count, exists);
+ ui_update();
+ tv_prev = tv_cur;
+ }
+ }
++count;
if (sock_getline(SESSION(session)->sock, &tmp) < 0) {
diff --git a/libsylph/utils.c b/libsylph/utils.c
index c45563c5..c6427cfd 100644
--- a/libsylph/utils.c
+++ b/libsylph/utils.c
@@ -3374,7 +3374,7 @@ void debug_print(const gchar *format, ...)
g_print("%s", buf);
}
-void print_status(const gchar *format, ...)
+void status_print(const gchar *format, ...)
{
va_list args;
gchar buf[BUFFSIZE];
diff --git a/libsylph/utils.h b/libsylph/utils.h
index ec581105..8d257366 100644
--- a/libsylph/utils.h
+++ b/libsylph/utils.h
@@ -498,7 +498,7 @@ void set_log_ui_func (LogFunc print_func,
void set_log_show_status_func (LogFunc status_func);
void debug_print (const gchar *format, ...) G_GNUC_PRINTF(1, 2);
-void print_status (const gchar *format, ...) G_GNUC_PRINTF(1, 2);
+void status_print (const gchar *format, ...) G_GNUC_PRINTF(1, 2);
void log_print (const gchar *format, ...) G_GNUC_PRINTF(1, 2);
void log_message (const gchar *format, ...) G_GNUC_PRINTF(1, 2);
diff --git a/src/folderview.c b/src/folderview.c
index 8b9ccaa2..0706e409 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1557,7 +1557,8 @@ static gboolean folderview_button_pressed(GtkWidget *widget,
&path, NULL, NULL, NULL))
return TRUE;
- if (folderview->selection_locked)
+ if (folderview->selection_locked ||
+ summary_is_locked(folderview->summaryview))
return TRUE;
if (event->button == 1 || event->button == 2) {
@@ -1599,7 +1600,8 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
if (!event) return FALSE;
- if (folderview->selection_locked)
+ if (folderview->selection_locked ||
+ summary_is_locked(folderview->summaryview))
return TRUE;
switch (event->keyval) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 07:08:04 +0000