From: Paul Mangan Date: Fri, 17 Sep 2004 07:58:22 +0000 (+0000) Subject: 2004-09-17 [paul] 0.9.12cvs102.1 X-Git-Tag: gtk2_win32_last_merge~164 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=217b245e7785b9d6dd9eb893bf68be6a49b9374e 2004-09-17 [paul] 0.9.12cvs102.1 * ChangeLog * ChangeLog.claws * ChangeLog.jp * configure.ac * src/inc.c sync with HEAD --- diff --git a/ChangeLog b/ChangeLog index 9d5faf688..5311e4e9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,86 @@ +2004-09-17 + + * src/filter.c: + filter_action_exec(): modified local filtering. + strmatch_regex(): use case-insensitive regex. + * src/summaryview.[ch]: display filtering result to the status bar. + +2004-09-14 + + * src/filter.[ch]: implemented filter rule application timing. + * src/prefs_fil_er_edit.c: prefs_filter_edit_action_hbox_set(): + fixed a bug that didn't display parameter of PF_ACTION_EXEC. + +2004-09-10 + + * src/prefs_filter.c: prefs_filter_write_user_header_list(): use + prefs_file_open() instead of fopen(). + +2004-09-10 + + * src/defs.h + src/prefs_filter.c: implemented load/save of user-defined + header list. + +2004-09-09 + + * src/inc.c: inc_spool() + src/prefs_common.c: modified spool path config so that users can + specify both file and directory. + +2004-09-09 + + * src/prefs_filter.[ch] + src/prefs_filter_edit.[ch]: implemented creating filter rule by + message. + +2004-09-07 + + * src/mimeview.c: mimeview_drag_data_get() + src/summaryview.c: summary_drag_data_get(): fixed broken URI in + DnD. + +2004-09-06 + + * src/filter.[ch] + src/summaryview.c: fixed local filtering. + * src/mh.c: mh_copy_msgs(): restored missing 'else'. + +2004-09-06 + + * src/foldersel.c: foldersel_new_folder(): fixed possible memory + corruption, and write folder list data after appending. + * src/summaryview.c: summary_show(): up FolderItem::opened flag + after reading message list. + +2004-09-03 + + * src/filter.c + src/inc.c + src/mbox.c + src/mh.c + src/procmsg.[ch] + src/summaryview.c: properly handle 'new' flags by using + FolderItem::mark_queue. + +2004-08-31 + + * src/filter.c + src/inc.c: modified 'new' flags management. + +2004-08-31 + + * src/prefs_filter.c: don't move to the last row when opening the + dialog. Clear CList when closing. + +2004-08-27 + + * src/filter.c + src/inc.c + src/pop.[ch] + src/prefs_filter_edit.c + src/summaryview.c: implemented FLT_ACTION_EXEC and FLT_ACTION_DELETE. + 2004-08-27 * src/prefs_filter.c: auto-scroll when a new rule is added. diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f8ee04917..e3ab09b8d 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,13 @@ +2004-09-17 [paul] 0.9.12cvs102.1 + + * ChangeLog + * ChangeLog.claws + * ChangeLog.jp + * configure.ac + * src/inc.c + sync with HEAD + + 2004-09-17 [colin] 0.9.12cvs101.1 * ChangeLog.claws diff --git a/ChangeLog.claws b/ChangeLog.claws index 7ba51f99d..c9098e298 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,11 @@ +2004-09-17 [paul] 0.9.12cvs102 + + * ChangeLog + * ChangeLog.jp + * src/inc.c + sync with main 0.9.12cvs14, see ChangeLog 2004-09-09 + + 2004-09-17 [colin] 0.9.12cvs101 * src/main.c diff --git a/ChangeLog.jp b/ChangeLog.jp index 3eda9eaac..024bae6ba 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,86 @@ +2004-09-17 + + * src/filter.c: + filter_action_exec(): ¥í¡¼¥«¥ë¥Õ¥£¥ë¥¿¥ê¥ó¥°¤ò½¤Àµ¡£ + strmatch_regex(): Â羮ʸ»ú̵»ë¤ÎÀµµ¬É½¸½¤ò»ÈÍÑ¡£ + * src/summaryview.[ch]: ¥Õ¥£¥ë¥¿·ë²Ì¤ò¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤Ëɽ¼¨¡£ + +2004-09-14 + + * src/filter.[ch]: ¥Õ¥£¥ë¥¿¥ë¡¼¥ëŬÍÑ¥¿¥¤¥ß¥ó¥°¤ò¼ÂÁõ¡£ + * src/prefs_fil_er_edit.c: prefs_filter_edit_action_hbox_set(): + PF_ACTION_EXEC ¤Î¥Ñ¥é¥á¡¼¥¿¤òɽ¼¨¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£ + +2004-09-10 + + * src/prefs_filter.c: prefs_filter_write_user_header_list(): fopen() + ¤ÎÂå¤ï¤ê¤Ë prefs_file_open() ¤ò»ÈÍÑ¡£ + +2004-09-10 + + * src/defs.h + src/prefs_filter.c: ¥æ¡¼¥¶ÄêµÁ¥Ø¥Ã¥À¥ê¥¹¥È¤Î¥í¡¼¥É/¥»¡¼¥Ö¤ò + ¼ÂÁõ¡£ + +2004-09-09 + + * src/inc.c: inc_spool() + src/prefs_common.c: ¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤ÎξÊý¤ò»ØÄê¤Ç¤­¤ë¤è¤¦¤Ë + ¥¹¥×¡¼¥ë¥Ñ¥¹¤ÎÀßÄê¤ò½¤Àµ¡£ + +2004-09-09 + + * src/prefs_filter.[ch] + src/prefs_filter_edit.[ch]: ¥á¥Ã¥»¡¼¥¸¤«¤é¤Î¥Õ¥£¥ë¥¿¥ë¡¼¥ë¤ÎºîÀ® + ¤ò¼ÂÁõ¡£ + +2004-09-07 + + * src/mimeview.c: mimeview_drag_data_get() + src/summaryview.c: summary_drag_data_get(): DnD ¤ÎÉÔÀµ¤Ê URI + ¤ò½¤Àµ¡£ + +2004-09-06 + + * src/filter.[ch] + src/summaryview.c: ¥í¡¼¥«¥ë¥Õ¥£¥ë¥¿¤ò½¤Àµ¡£ + * src/mh.c: mh_copy_msgs(): 'else' ¤¬È´¤±¤Æ¤¤¤¿¤Î¤ò½¤Àµ¡£ + +2004-09-06 + + * src/foldersel.c: foldersel_new_folder(): ÀøºßŪ¤Ê¥á¥â¥êÇ˲õ¤ò½¤Àµ + ¤·¡¢Äɲøå¤Ë¥Õ¥©¥ë¥À¥ê¥¹¥È¤ò½ñ¤­½Ð¤¹¤è¤¦¤Ë¤·¤¿¡£ + * src/summaryview.c: summary_show(): ¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤òÆɤ߹þ¤ó¤À + ¸å¤Ë FolderItem::opened ¥Õ¥é¥°¤òΩ¤Æ¤ë¤è¤¦¤Ë¤·¤¿¡£ + +2004-09-03 + + * src/filter.c + src/inc.c + src/mbox.c + src/mh.c + src/procmsg.[ch] + src/summaryview.c: FolderItem::mark_queue ¤ò»ÈÍѤ·¤Æ¿·Ãå¥Õ¥é¥°¤ò + Àµ¤·¤¯°·¤¦¤è¤¦¤Ë¤·¤¿¡£ + +2004-08-31 + + * src/filter.c + src/inc.c: ¿·Ãå¥Õ¥é¥°´ÉÍý¤Î½¤Àµ¡£ + +2004-08-31 + + * src/prefs_filter.c: ¥À¥¤¥¢¥í¥°¤ò³«¤¤¤¿»þ¤ËºÇ¸å¤Î¹Ô¤Ë°ÜÆ°¤·¤Ê¤¤ + ¤è¤¦¤Ë¤·¤¿¡£ÊĤ¸¤ë»þ¤Ë CList ¤ò¥¯¥ê¥¢¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£ + +2004-08-27 + + * src/filter.c + src/inc.c + src/pop.[ch] + src/prefs_filter_edit.c + src/summaryview.c: FLT_ACTION_EXEC ¤È FLT_ACTION_DELETE ¤ò¼ÂÁõ¡£ + 2004-08-27 * src/prefs_filter.c: ¿·µ¬¥ë¡¼¥ë¤¬Äɲ䵤줿¤é¼«Æ°¥¹¥¯¥í¡¼¥ë¤¹¤ë diff --git a/PATCHSETS b/PATCHSETS index 732a3f68a..f33610eed 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -170,3 +170,4 @@ ( cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/action.c; ) > 0.9.12cvs99.4.patchset ( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/socket.c; cvs diff -u -r 1.100.2.4 -r 1.100.2.5 AUTHORS; ) > 0.9.12cvs99.5.patchset ( cvs diff -u -r 1.2504.2.20 -r 1.2504.2.21 ChangeLog.claws; cvs diff -u -r 1.115.2.17 -r 1.115.2.18 src/main.c; ) > 0.9.12cvs101.1.patchset +( cvs diff -u -r 1.396.2.9 -r 1.396.2.10 ChangeLog; cvs diff -u -r 1.2504.2.21 -r 1.2504.2.22 ChangeLog.claws; cvs diff -u -r 1.391.2.9 -r 1.391.2.10 ChangeLog.jp; cvs diff -u -r 1.654.2.204 -r 1.654.2.205 configure.ac; cvs diff -u -r 1.149.2.14 -r 1.149.2.15 src/inc.c; ) > 0.9.12cvs102.1.patchset diff --git a/configure.ac b/configure.ac index dff706dc0..3de074bd9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=101 +EXTRA_VERSION=102 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/inc.c b/src/inc.c index a0d687010..2eb7b7fe6 100644 --- a/src/inc.c +++ b/src/inc.c @@ -1219,11 +1219,9 @@ static gint inc_dialog_delete_cb(GtkWidget *widget, GdkEventAny *event, static gint inc_spool_account(PrefsAccount *account) { FolderItem *inbox; - gchar *mbox, *logname; + gchar *mbox; gint result; - logname = g_get_user_name(); - if (account->inbox) { inbox = folder_find_item_from_path(account->inbox); if (!inbox) @@ -1233,9 +1231,14 @@ static gint inc_spool_account(PrefsAccount *account) if (is_file_exist(account->local_mbox)) mbox = g_strdup(account->local_mbox); - else - mbox = g_strconcat(account->local_mbox, - G_DIR_SEPARATOR_S, logname, NULL); + else if (is_dir_exist(account->local_mbox)) + mbox = g_strconcat(account->local_mbox, G_DIR_SEPARATOR_S, + g_get_user_name(), NULL); + else { + debug_print("%s: local mailbox not found.\n", + account->local_mbox); + return -1; + } result = get_spool(inbox, mbox); g_free(mbox); @@ -1278,7 +1281,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox) g_return_val_if_fail(mbox != NULL, -1); if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) { - debug_print("no messages in local mailbox.\n"); + debug_print("%s: no messages in local mailbox.\n", mbox); return 0; } else if (size < 0) return -1;