more sync with sylpheed 0.6.2cvs5
authorPaul Mangan <paul@claws-mail.org>
Tue, 25 Sep 2001 09:12:39 +0000 (09:12 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 25 Sep 2001 09:12:39 +0000 (09:12 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
TODO
TODO.jp
src/folder.c
src/mainwindow.c

index 92c7135..15bd0dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-25
+
+       * src/folder.c
+         src/folder.h
+         src/mainwindow.c
+         src/summaryview.c: applied the patch from Alfons that allows
+         threading setting for each folders (tnanks!).
+
 2001-09-23
 
        * src/message_search.[ch]: new. A Dialog for searching in current
index 1543c1f..52e98a9 100644 (file)
@@ -1,3 +1,7 @@
+2001-09-25 [paul]
+
+       * more sync with sylpheed 0.6.2cvs5
+
 2001-09-24 [alfons]
        
        * src/prefs_folder_item.c
index dd8d1ef..f93936a 100644 (file)
@@ -1,3 +1,11 @@
+2001-09-25
+
+       * src/folder.c
+         src/folder.h
+         src/mainwindow.c
+         src/summaryview.c: ¥Õ¥©¥ë¥ÀËè¤Î¥¹¥ì¥Ã¥Éɽ¼¨ÀßÄ꤬¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë
+         Alfons ¤µ¤ó¤Î¥Ñ¥Ã¥Á¤òŬÍÑ(thanks!)¡£
+
 2001-09-23
 
        * src/message_search.[ch]: ¿·µ¬¡£¸½ºß¤Î¥á¥Ã¥»¡¼¥¸¤Î¸¡º÷¥À¥¤¥¢¥í¥°¡£
diff --git a/TODO b/TODO
index 6b81b93..a45a789 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,13 +4,11 @@ TODO
 (The upper item has the greater priority or feasibility... maybe :-)
 
 o POP before SMTP
-o full-text search of messages (plain, or hooking up with Namazu)
 o original icons and logos
 o autosave
 o template function
 o speed-up of filtering
 o regular expression support at filtering
-o LDAP support
 o support for some formats other than MH and mbox (ex. Maildir)
 o priority (Priority:, X-Priority:, X-MSMail-Priority:)
 o notification of reception (Disposition-Notification-To:)
@@ -18,6 +16,7 @@ o customization of key bindings
 o customization of toolbar
 o configuration for each folders
 o RFC 2231 (MIME filename encoding) compliant
+o full-text search using Namazu
 o virtual folder
 o console mode interface
 o plug-in faculty
@@ -67,3 +66,5 @@ Implemented features
 * IMAP4 support
 * list view of newsgroups and subscription of groups from there
 * SSL support
+* LDAP support
+* full-text search of messages (plain)
diff --git a/TODO.jp b/TODO.jp
index be91377..46405dc 100644 (file)
--- a/TODO.jp
+++ b/TODO.jp
@@ -4,13 +4,11 @@ TODO
 (¾å¤Î¤â¤Î¤Û¤É½ÅÍ×ÅÙ¡¢¼Â¸½²ÄǽÀ­¤¬¹â¤¯¤Ê¤ë¡¢¤«¤â(^^;)
 
 o POP before SMTP
-o ¥á¥Ã¥»¡¼¥¸¤ÎÁ´Ê¸¸¡º÷ (¥Ù¥¿¡¢ Namazu ¤È¤ÎÏ¢·È)
 o ¥ª¥ê¥¸¥Ê¥ë¤Î¥¢¥¤¥³¥ó¤È¥í¥´
 o ¼«Æ°Êݸµ¡Ç½
 o ¥Æ¥ó¥×¥ì¡¼¥Èµ¡Ç½
 o ¿¶¤êʬ¤±½èÍý¤Î¶¯²½
 o ¿¶¤êʬ¤±¤ÇÀµµ¬É½¸½¤ËÂбþ¤¹¤ë
-o LDAPÂбþ
 o MH, mbox °Ê³°¤Î·Á¼°¤Ø¤ÎÂбþ(Maildir Åù)
 o ½ÅÍ×ÅÙ (Priority:, X-Priority:, X-MSMail-Priority:)
 o ¼õ¿®³Îǧ (Disposition-Notification-To:)
@@ -18,6 +16,7 @@ o 
 o ¥Ä¡¼¥ë¥Ð¡¼¤Î¥«¥¹¥¿¥Þ¥¤¥º
 o ¥Õ¥©¥ë¥ÀËè¤ÎÀßÄê
 o RFC 2231 (MIME ¥Õ¥¡¥¤¥ë̾¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°) Âбþ
+o Namazu ¤È¤ÎÏ¢·È¤Ë¤è¤ëÁ´Ê¸¸¡º÷
 o ²¾ÁÛ¥Õ¥©¥ë¥À
 o ¥³¥ó¥½¡¼¥ë¥â¡¼¥É¥¤¥ó¥¿¥Õ¥§¡¼¥¹
 o ¥×¥é¥°¥¤¥óµ¡Ç½
@@ -68,3 +67,5 @@ o 
 * IMAP4Âбþ
 * ¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Î¥ê¥¹¥Èɽ¼¨¤È¤½¤³¤«¤é¤Î¹ØÆÉ¥°¥ë¡¼¥×ÄɲÃ
 * SSLÂбþ
+* LDAPÂбþ
+* ¥á¥Ã¥»¡¼¥¸¤ÎÁ´Ê¸¸¡º÷ (¥Ù¥¿)
index ea643a5..7afe517 100644 (file)
@@ -156,7 +156,7 @@ FolderItem *folder_item_new(const gchar *name, const gchar *path)
        item->no_sub = FALSE;
        item->no_select = FALSE;
        item->collapsed = FALSE;
-       item->threaded  = FALSE;
+       item->threaded  = TRUE;
        item->ret_rcpt  = FALSE;
        item->parent = NULL;
        item->folder = NULL;
@@ -1042,7 +1042,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
        gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
-                threaded = FALSE, ret_rcpt = FALSE;
+                threaded = TRUE, ret_rcpt = FALSE;
        gint mtime = 0, new = 0, unread = 0, total = 0;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -1141,7 +1141,7 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
-       gboolean collapsed = FALSE, threaded = FALSE, ret_rcpt = FALSE;
+       gboolean collapsed = FALSE, threaded = TRUE, ret_rcpt = FALSE;
 
        if (g_node_depth(node) != 2) return FALSE;
        g_return_val_if_fail(node->data != NULL, FALSE);
index 5398272..c4c4e5c 100644 (file)
@@ -1240,7 +1240,8 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (mainwin->summaryview->folder_item) {
                if (mainwin->summaryview->folder_item->threaded)
                        state |= M_THREADED;
-               else state |= M_UNTHREADED;     
+               else
+                       state |= M_UNTHREADED;  
        }               
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
@@ -1349,8 +1350,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
                {"/Summary/Go to/Next labeled message", M_MSG_EXIST},
                {"/Summary/Sort"                      , M_MSG_EXIST},
-               {"/Summary/Thread view"               , M_UNTHREADED | M_UNLOCKED},
-               {"/Summary/Unthread view"             , M_THREADED | M_UNLOCKED},
+               {"/Summary/Thread view"               , M_UNTHREADED},
+               {"/Summary/Unthread view"             , M_THREADED},
 
                {"/Configuration", M_UNLOCKED},
 
@@ -2544,21 +2545,21 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GtkItemFactory *ifactory;
 
+       if (!mainwin->summaryview->folder_item) return;
+
        ifactory = gtk_item_factory_from_widget(widget);
 
-       if (mainwin->summaryview->folder_item) {
-               if (0 == action) {
-                       summary_thread_build(mainwin->summaryview, FALSE);
-                       mainwin->summaryview->folder_item->threaded = TRUE;
-                       menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
-                       menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
-               } else {
-                       summary_unthread(mainwin->summaryview);
-                       mainwin->summaryview->folder_item->threaded = FALSE;
-                       menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
-                       menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
-               }
-       }               
+       if (0 == action) {
+               summary_thread_build(mainwin->summaryview, FALSE);
+               mainwin->summaryview->folder_item->threaded = TRUE;
+               menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
+               menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
+       } else {
+               summary_unthread(mainwin->summaryview);
+               mainwin->summaryview->folder_item->threaded = FALSE;
+               menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
+               menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
+       }
 }
 
 static void set_display_item_cb(MainWindow *mainwin, guint action,