sync with sylpheed 0.7.4cvs8

diff --git a/ChangeLog b/ChangeLog
index 93214bb7e5dcdf99ec99c489b63c6d96ae4170e0..c879100949a013b2339d9f935a64638de5e877ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-03-19
+
+       * src/mainwindow.c: modified some menu items.
+
+2002-03-19
+
+       * src/defs.h: changed OUTBOX_DIR from "outbox" to "sent"
+         (current "outbox" will be kept until rescan).
+       * src/folder.c: folder_set_missing_folders(): create the missing
+         folders.
+       * src/foldersel.c
+         src/folderview.c: changed 'Outbox' to 'Sent'.
+       * src/main.c: call folder_set_missing_folders().
+       * src/mh.c: mh_scan_tree(): create missing folders.
+       * src/summaryview.c: summary_set_menu_sensitive(): fixed a bug that
+         didn't set the menu sensitivity correctly.
+
 2002-03-18
 
        * src/folderview.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3ce05b283edf48f66cba5369d2290ed8e97356e8..ffc44e9104626b73e26181915983b70fa9ef9f38 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-02-19 [paul]      0.7.4claws23
+
+       * sync with sylpheed 0.7.4cvs8
+               see ChangeLog entries 2002-03-19
+
 2002-03-18 [paul]      0.7.4claws22
 
        * sync with sylpheed 0.7.4cvs6

diff --git a/ChangeLog.jp b/ChangeLog.jp
index fcf34d1dbe5026b31528a7878bf816c7ab2ff58a..4aa07a0fa2e7a4959f4099bd16a2e35ca3ddb780 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,20 @@
+2002-03-19
+
+       * src/mainwindow.c: ¤¤¤¯¤Ä¤«¤Î¥á¥Ë¥å¡¼¹àÌܤò½¤Àµ¡£
+
+2002-03-19
+
+       * src/defs.h: OUTBOX_DIR ¤ò "outbox" ¤«¤é "sent" ¤ËÊѹ¹
+         (¸½ºß¤Î "outbox" ¤ÏºÆ¥¹¥­¥ã¥ó¤Þ¤ÇÊÝ»ý¤µ¤ì¤Þ¤¹)¡£
+       * src/folder.c: folder_set_missing_folders(): ­¤ê¤Ê¤¤¥Õ¥©¥ë¥À¤ò
+         À¸À®¡£
+       * src/foldersel.c
+         src/folderview.c: 'Outbox' ¤ò 'Sent' ¤ËÊѹ¹¡£
+       * src/main.c: folder_set_missing_folders() ¤ò¸Æ¤Ö¤è¤¦¤Ë¤·¤¿¡£
+       * src/mh.c: mh_scan_tree(): ­¤ê¤Ê¤¤¥Õ¥©¥ë¥À¤òÀ¸À®¡£
+       * src/summaryview.c: summary_set_menu_sensitive(): ¥á¥Ë¥å¡¼¤Î
+         ¥»¥ó¥·¥Æ¥£¥Ó¥Æ¥£¤òÀµ¤·¤¯¥»¥Ã¥È¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ¡£
+
 2002-03-18
 
        * src/folderview.c

diff --git a/configure.in b/configure.in
index a5009314b40d7fd6cf6fdab30828e26a673edcd3..4f716f93a6136c021d1bf9f39808b5680d50f8c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws23
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/defs.h b/src/defs.h
index 573fa913aa4e96180c8b661a4571a82c23d34a3a..1ee48fad031bc5df51263eabc8a76a013b95f847 100644 (file)
--- a/src/defs.h
+++ b/src/defs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 #endif
 
 #define INBOX_DIR              "inbox"
-#define OUTBOX_DIR             "outbox"
+#define OUTBOX_DIR             "sent"
 #define QUEUE_DIR              "queue"
 #define DRAFT_DIR              "draft"
 #define TRASH_DIR              "trash"

diff --git a/src/folder.c b/src/folder.c
index 912ff907b6b89f8c78c0db15f8832c18d7df8c07..b7dddb229b2402968f271e5e231a8035c30244ea 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -520,6 +520,50 @@ FolderItem *folder_get_default_trash(void)
        return folder->trash;
 }
 
+#define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type)  \
+{                                                      \
+       if (!folder->member) {                          \
+               item = folder_item_new(dir, dir);       \
+               item->stype = type;                     \
+               folder_item_append(rootitem, item);     \
+               folder->member = item;                  \
+       }                                               \
+}
+
+void folder_set_missing_folders(void)
+{
+       Folder *folder;
+       FolderItem *rootitem;
+       FolderItem *item;
+       GList *list;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->type != F_MH) continue;
+               rootitem = FOLDER_ITEM(folder->node->data);
+               g_return_if_fail(rootitem != NULL);
+
+               if (folder->inbox && folder->outbox && folder->draft &&
+                   folder->queue && folder->trash)
+                       continue;
+
+               if (folder->create_tree(folder) < 0) {
+                       g_warning("%s: can't create the folder tree.\n",
+                                 LOCAL_FOLDER(folder)->rootpath);
+                       continue;
+               }
+
+               CREATE_FOLDER_IF_NOT_EXIST(inbox,  INBOX_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(outbox, OUTBOX_DIR, F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(draft,  DRAFT_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(queue,  QUEUE_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(trash,  TRASH_DIR,  F_INBOX);
+       }
+
+}
+
+#undef CREATE_FOLDER_IF_NOT_EXIST
+
 gchar *folder_item_get_path(FolderItem *item)
 {
        gchar *folder_path;

diff --git a/src/folder.h b/src/folder.h
index 649b10dde87c3aa082193d0650f8d234847c3809..f7897cbbe28ba05c8e35587fdca26565bf04b43c 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -265,6 +265,7 @@ FolderItem *folder_get_default_draft        (void);
 FolderItem *folder_get_default_queue   (void);
 FolderItem *folder_get_default_trash   (void);
 FolderItem *folder_get_default_processing (void);
+void folder_set_missing_folders                (void);
 
 gchar *folder_item_get_path            (FolderItem     *item);
 void   folder_item_scan                        (FolderItem     *item);

diff --git a/src/foldersel.c b/src/foldersel.c
index b27f31275658d3075d312ade60e94c1415abec54..de7eedf9ae65bdfb5deeb84ee43efe62d2abaae6 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -218,7 +218,7 @@ static gboolean foldersel_gnode_func(GtkCTree *ctree, guint depth,
                name = _("Inbox");
                break;
        case F_OUTBOX:
-               name = _("Outbox");
+               name = _("Sent");
                break;
        case F_QUEUE:
                name = _("Queue");

diff --git a/src/folderview.c b/src/folderview.c
index 0c75bc2a09a48d557396d79a252ee7c6b318fa70..754e923f0a96ae982527e4be30ff9062c0c0a914 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1002,7 +1002,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }
-               name = g_strdup(_("Outbox"));
+               name = g_strdup(_("Sent"));
                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {

diff --git a/src/main.c b/src/main.c
index ff36dbfb3e8a0c731e2f70e12ca40ebfad666bfa..32d3780356d8349e50b775a422c8864ae5178cae 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -294,6 +294,7 @@ int main(int argc, char *argv[])
        }
 
        account_set_missing_folder();
+       folder_set_missing_folders();
        folderview_set(folderview);
 
        /* prefs_scoring_read_config(); */

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 13ce95be83b8abd5534764ab3b382b373661074a..53aaf15c7f71a29fc9dc5ec9fe00268b7c3da69e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -627,7 +627,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Go to/Other _folder..."),  "G", goto_folder_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
-       {N_("/_View/_View source"),             "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
        {N_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update"),                  "<control><alt>U", update_summary_cb,  0, NULL},
@@ -1572,7 +1572,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Go to/Next labeled message", M_MSG_EXIST},
                {"/View/Open in new window"        , M_SINGLE_TARGET_EXIST},
                {"/View/Show all header"           , M_SINGLE_TARGET_EXIST},
-               {"/View/View source"               , M_SINGLE_TARGET_EXIST},
+               {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},

diff --git a/src/mh.c b/src/mh.c
index 81184b3c7d0ae27ae5f74c540c376550d42e5931..5803033c4c57a40f295c9fb9bcf4e05d4845b909 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -788,6 +788,7 @@ void mh_scan_tree(Folder *folder)
        }
        g_free(rootpath);
 
+       mh_create_tree(folder);
        mh_scan_tree_recursive(item, pptable);
        
        folder_persist_prefs_free(pptable);

diff --git a/src/summaryview.c b/src/summaryview.c
index b355a68329cfcc8511da141014e4bd44f8392eec..ff17523bbf9905695d8dc0c2b2f86f0780b3da72 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1048,9 +1048,11 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                return;
        }
 
-       if (summaryview->folder_item->folder->type != F_NEWS) {
+       if (summaryview->folder_item->folder->type != F_NEWS)
                menu_set_sensitive(ifactory, "/Move...", TRUE);
-       }
+       else
+               menu_set_sensitive(ifactory, "/Move...", FALSE);
+
        menu_set_sensitive(ifactory, "/Delete", TRUE);
        menu_set_sensitive(ifactory, "/Select thread", TRUE);
        menu_set_sensitive(ifactory, "/Select all", TRUE);
@@ -1086,6 +1088,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
            summaryview->folder_item->stype == F_DRAFT  ||
            summaryview->folder_item->stype == F_QUEUE)
                menu_set_sensitive(ifactory, "/Re-edit", sens);
+       else
+               menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);