sync with 0.7.5cvs19

diff --git a/ChangeLog b/ChangeLog
index ea0bab58ff7ff7549b5dd5aa33701e643c6d584c..0f4ce7e48b7af900ab663269e048c10258870460 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2002-05-11
+
+       * src/imap.c: imap_scan_tree(): don't use namespace for prefix.
+       * src/prefs_folder_item.c: show also identifier path.
+         Made layout using table. Show uneditable entry using background
+         color of window.
+       * src/procmime.c: procmime_get_tmp_file_name(): generate safe
+         file name.
+
+2002-05-11
+
+       * src/automaton.[ch]: added UI callback to Automaton.
+       * src/inc.c
+         src/pop.c: use callback instead of calling inc_progress_update()
+         directly.
+         pop3_getrange_uidl_recv(): don't fall back to LAST when 'get all'
+         option is set.
+
+2002-05-10
+
+       * src/folderview.c: properly sort abbreviated newsgroups.
+
 2002-05-10
 
        * src/folderview.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4af3f3446e42a40b5058d08cabe6681dca46a862..e6460136b64439f41d1c25b59a981da50b10b2c7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-11 [paul]      0.7.5claws17
+
+       * sync with 0.7.5cvs19 (except src/prefs_folder_item.c)
+               see ChangeLog 2002-05-10 and 2002-05-11
+
 2002-05-10 [paul]      0.7.5claws16
 
        * sync with 0.7.5cvs16

diff --git a/ChangeLog.jp b/ChangeLog.jp
index d32ddd4259008952b6a43d66cfa40c249bf4b4e3..7817990ab9ed61c42c209630b1dd22055efaf6d0 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,27 @@
+2002-05-11
+
+       * src/imap.c: imap_scan_tree(): namespace ¤ò¥×¥ì¥Õ¥£¥¯¥¹¤Ë»ÈÍѤ·¤Ê¤¤
+         ¤è¤¦¤Ë¤·¤¿¡£
+       * src/prefs_folder_item.c: ¼±Ê̻ҥѥ¹¤âɽ¼¨¡£
+         table ¤ò»È¤Ã¤Æ¥ì¥¤¥¢¥¦¥È¡£ÊÔ½¸ÉԲĤʥ¨¥ó¥È¥ê¤ò¥¦¥£¥ó¥É¥¦¤ÎÇØ·Ê¿§
+         ¤Çɽ¼¨¡£
+       * src/procmime.c: procmime_get_tmp_file_name(): °ÂÁ´¤Ê¥Õ¥¡¥¤¥ë̾¤ò
+         À¸À®¡£
+
+2002-05-11
+
+       * src/automaton.[ch]: Automaton ¤Ë UI ¥³¡¼¥ë¥Ð¥Ã¥¯¤òÄɲá£
+       * src/inc.c
+         src/pop.c: inc_progress_update() ¤òľÀܸƤÖÂå¤ï¤ê¤Ë¥³¡¼¥ë¥Ð¥Ã¥¯¤ò
+         »ÈÍÑ¡£
+         pop3_getrange_uidl_recv(): ¡ÖÁ´¼õ¿®¡×¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë
+         ¤È¤­¤Ï LAST ¤Ë fallback ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
+2002-05-10
+
+       * src/folderview.c: ´Êάɽ¼¨¤µ¤ì¤¿¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÀµ¤·¤¯¥½¡¼¥È
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-05-10
 
        * src/folderview.c

diff --git a/configure.in b/configure.in
index d69f278086696affe77e1bc9668caaf395538c7a..757b0d6b85b0005b1f12b1e4895af746828429d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws16
+EXTRA_VERSION=claws17
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/automaton.c b/src/automaton.c
index b36d90a1af617be7242b8feae67dcf782afa3741..2ddb198caefbdc59aae0d578650c89f45cabe98a 100644 (file)
--- a/src/automaton.c
+++ b/src/automaton.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
@@ -65,6 +65,8 @@ void automaton_input_cb(gpointer data, gint dummy_source,
        gdk_input_remove(atm->tag);
        atm->tag = 0;
 
+       if (atm->ui_func)
+               atm->ui_func(atm->data, atm->num);
        next = atm->state[atm->num].handler(sock, atm->data);
 
        if (atm->terminated)

diff --git a/src/automaton.h b/src/automaton.h
index d8d3d8c4bd4499fad8da86c1454e5c1acf4d078a..41910cd91dd5a7cef26981bdcc4d6f776a0fd709 100644 (file)
--- a/src/automaton.h
+++ b/src/automaton.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
@@ -27,12 +27,16 @@
 typedef struct _AtmState       AtmState;
 typedef struct _Automaton      Automaton;
 
-typedef gint   (*AtmHandler)   (SockInfo *source, gpointer data);
+typedef gint   (*AtmHandler)   (SockInfo       *source,
+                                gpointer        data);
+typedef void   (*AtmUIFunc)    (gpointer        data,
+                                gint            state);
 
 struct _AtmState
 {
        GdkInputCondition condition;
-       gint (*handler)(SockInfo *source, gpointer data);
+       gint (*handler) (SockInfo       *source,
+                        gpointer        data);
 };
 
 struct _Automaton
@@ -43,15 +47,22 @@ struct _Automaton
        guint timeout_tag;
        guint elapsed;
        gboolean terminated;
+
        gpointer data;
        AtmState *state;
-       gint (*terminate)(SockInfo *source, gpointer data);
+
+       gint (*terminate)       (SockInfo       *source,
+                                gpointer        data);
+
+       AtmUIFunc ui_func;
+
        SockInfo *help_sock;
 };
 
-Automaton *automaton_create(gint num);
-void automaton_destroy(Automaton *atm);
-void automaton_input_cb(gpointer data, gint dummy_source,
-                       GdkInputCondition condition);
+Automaton *automaton_create    (gint                    num);
+void automaton_destroy         (Automaton              *atm);
+void automaton_input_cb                (gpointer                data,
+                                gint                    dummy_source,
+                                GdkInputCondition       condition);
 
 #endif /* __AUTOMATON_H__ */

diff --git a/src/folderview.c b/src/folderview.c
index 0e564152a55da3b5431fa5e978753863c6960242..124d317bb0dbaa81e36024334f2cd0fbed25ce0b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -156,6 +156,9 @@ static GtkCTreeNode *folderview_find_by_name        (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 const gchar    *name);
 
+static gint folderview_clist_compare   (GtkCList       *clist,
+                                        gconstpointer   ptr1,
+                                        gconstpointer   ptr2);
 static gint folderview_compare_name    (gconstpointer   a,
                                         gconstpointer   b);
 
@@ -387,6 +390,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
+       gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
 
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
@@ -2295,7 +2299,7 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                gtk_ctree_node_set_row_data(ctree, node, newitem);
        }
 
-       gtk_ctree_sort_node(ctree, servernode);
+       folderview_sort_folders(folderview, servernode, folder);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        slist_free_strings(new_subscr);
@@ -2509,6 +2513,20 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                gtk_drag_finish(drag_context, FALSE, FALSE, time);
 }
 
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
+
+       return g_strcasecmp(item1->name, item2->name);
+}
+
 static gint folderview_compare_name(gconstpointer a, gconstpointer b)
 {
        const FolderItem *item = a;

diff --git a/src/imap.c b/src/imap.c
index 835e66c03a4747e17fe7ac679b997cd3f5e54e99..de06eb838ffcdc18792f4fcdfcfc9c88fed4cdf5 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -973,7 +973,6 @@ gint imap_scan_folder(Folder *folder, FolderItem *item)
 
 void imap_scan_tree(Folder *folder)
 {
-       IMAPFolder *imapfolder = IMAP_FOLDER(folder);
        FolderItem *item;
        IMAPSession *session;
        gchar *root_folder = NULL;
@@ -985,29 +984,15 @@ void imap_scan_tree(Folder *folder)
        if (!session) return;
 
        if (folder->account->imap_dir && *folder->account->imap_dir) {
-               gchar *imap_dir;
-               IMAPNameSpace *namespace = NULL;
-
-               Xstrdup_a(imap_dir, folder->account->imap_dir, return);
-               strtailchomp(imap_dir, '/');
-
-               if (imapfolder->ns_personal && imapfolder->ns_personal->data)
-                       namespace = (IMAPNameSpace *)imapfolder->ns_personal->data;
-               root_folder = g_strconcat
-                       (namespace && namespace->name ? namespace->name : "",
-                        imap_dir, NULL);
-               if (namespace && namespace->separator)
-                       subst_char(root_folder, namespace->separator, '/');
-       }
-
-       if (root_folder)
+               Xstrdup_a(root_folder, folder->account->imap_dir, return);
+               strtailchomp(root_folder, '/');
                debug_print("IMAP root directory: %s\n", root_folder);
+       }
 
        folder_tree_destroy(folder);
        item = folder_item_new(folder->name, root_folder);
        item->folder = folder;
        folder->node = g_node_new(item);
-       g_free(root_folder);
 
        imap_scan_tree_recursive(session, item);
 

diff --git a/src/inc.c b/src/inc.c
index de6183bc6bd3a82e28e485f59a74110ee08466ab..67b188197d8ae6cddb847689f9c00efcb8e3b69d 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -689,6 +689,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        }
 
        atm->terminate = (AtmHandler)pop3_automaton_terminate;
+       atm->ui_func = (AtmUIFunc)inc_progress_update;
 
        atm->num = POP3_GREETING_RECV;
 
@@ -945,35 +946,27 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
        case POP3_GREETING_RECV:
                break;
        case POP3_GETAUTH_USER_SEND:
-       case POP3_GETAUTH_USER_RECV:
        case POP3_GETAUTH_PASS_SEND:
-       case POP3_GETAUTH_PASS_RECV:
        case POP3_GETAUTH_APOP_SEND:
-       case POP3_GETAUTH_APOP_RECV:
                progress_dialog_set_label(dialog, _("Authenticating..."));
                break;
        case POP3_GETRANGE_STAT_SEND:
-       case POP3_GETRANGE_STAT_RECV:
                progress_dialog_set_label
                        (dialog, _("Getting the number of new messages (STAT)..."));
                break;
        case POP3_GETRANGE_LAST_SEND:
-       case POP3_GETRANGE_LAST_RECV:
                progress_dialog_set_label
                        (dialog, _("Getting the number of new messages (LAST)..."));
                break;
        case POP3_GETRANGE_UIDL_SEND:
-       case POP3_GETRANGE_UIDL_RECV:
                progress_dialog_set_label
                        (dialog, _("Getting the number of new messages (UIDL)..."));
                break;
        case POP3_GETSIZE_LIST_SEND:
-       case POP3_GETSIZE_LIST_RECV:
                progress_dialog_set_label
                        (dialog, _("Getting the size of messages (LIST)..."));
                break;
        case POP3_TOP_SEND:
-       case POP3_TOP_RECV:
                g_snprintf(buf, sizeof(buf),
                           _("Retrieving header (%d / %d)"),
                           state->cur_msg, state->count);
@@ -988,7 +981,6 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                         (gfloat)(state->count));
                break;
        case POP3_RETR_SEND:
-       case POP3_RETR_RECV:
                Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
                g_snprintf(buf, sizeof(buf),
                           _("Retrieving message (%d / %d) (%s / %s)"),
@@ -1005,12 +997,12 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                         (gfloat)(state->cur_total_bytes) /
                         (gfloat)(state->total_bytes));
                break;
+#if 0
        case POP3_DELETE_SEND:
-       case POP3_DELETE_RECV:
                progress_dialog_set_label(dialog, _("Deleting message"));
                break;
+#endif
        case POP3_LOGOUT_SEND:
-       case POP3_LOGOUT_RECV:
                progress_dialog_set_label(dialog, _("Quitting"));
                break;
        default:

diff --git a/src/pop.c b/src/pop.c
index b2b5136136ff012e32f8a129a5cd30d32a69d8a6..f04046ed50eda7166adf7914019deb6f1af3ea8d 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -89,8 +89,6 @@ gint pop3_getauth_user_send(SockInfo *sock, gpointer data)
 
        g_return_val_if_fail(state->user != NULL, -1);
 
-       inc_progress_update(state, POP3_GETAUTH_USER_SEND);
-
        pop3_gen_send(sock, "USER %s", state->user);
 
        return POP3_GETAUTH_USER_RECV;
@@ -150,8 +148,6 @@ gint pop3_getauth_apop_send(SockInfo *sock, gpointer data)
        g_return_val_if_fail(state->user != NULL, -1);
        g_return_val_if_fail(state->pass != NULL, -1);
 
-       inc_progress_update(state, POP3_GETAUTH_APOP_SEND);
-
        if ((start = strchr(state->greeting, '<')) == NULL) {
                log_warning(_("Required APOP timestamp not found "
                              "in greeting\n"));
@@ -196,10 +192,6 @@ gint pop3_getauth_apop_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getrange_stat_send(SockInfo *sock, gpointer data)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       inc_progress_update(state, POP3_GETRANGE_STAT_SEND);
-
        pop3_gen_send(sock, "STAT");
 
        return POP3_GETRANGE_STAT_RECV;
@@ -235,10 +227,6 @@ gint pop3_getrange_stat_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getrange_last_send(SockInfo *sock, gpointer data)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       inc_progress_update(state, POP3_GETRANGE_LAST_SEND);
-
        pop3_gen_send(sock, "LAST");
 
        return POP3_GETRANGE_LAST_RECV;
@@ -269,10 +257,6 @@ gint pop3_getrange_last_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getrange_uidl_send(SockInfo *sock, gpointer data)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       inc_progress_update(state, POP3_GETRANGE_UIDL_SEND);
-
        pop3_gen_send(sock, "UIDL");
 
        return POP3_GETRANGE_UIDL_RECV;
@@ -286,12 +270,18 @@ gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
        gchar buf[POPBUFSIZE];
        gchar id[IDLEN + 1];
 
-       if (pop3_ok(sock, NULL) != PS_SUCCESS) return POP3_GETRANGE_LAST_SEND;
-
        if (!state->uidl_table) new = TRUE;
        if (state->ac_prefs->getall)
                get_all = TRUE;
 
+       if (pop3_ok(sock, NULL) != PS_SUCCESS) {
+               /* UIDL is not supported */
+               if (!get_all)
+                       return POP3_GETRANGE_LAST_SEND;
+               else
+                       return POP3_GETSIZE_LIST_SEND;
+       }
+
        while (sock_gets(sock, buf, sizeof(buf)) >= 0) {
                gint num;
 
@@ -370,10 +360,6 @@ static gboolean should_delete(const char *uidl, gpointer data)
 
 gint pop3_getsize_list_send(SockInfo *sock, gpointer data)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       inc_progress_update(state, POP3_GETSIZE_LIST_SEND);
-
        pop3_gen_send(sock, "LIST");
 
        return POP3_GETSIZE_LIST_RECV;
@@ -469,8 +455,6 @@ gint pop3_retr_send(SockInfo *sock, gpointer data)
 {
        Pop3State *state = (Pop3State *)data;
 
-       inc_progress_update(state, POP3_RETR_SEND);
-
        pop3_gen_send(sock, "RETR %d", state->cur_msg);
 
        return POP3_RETR_RECV;
@@ -522,8 +506,6 @@ gint pop3_delete_send(SockInfo *sock, gpointer data)
 {
        Pop3State *state = (Pop3State *)data;
 
-       /* inc_progress_update(state, POP3_DELETE_SEND); */
-
        pop3_gen_send(sock, "DELE %d", state->cur_msg);
 
        return POP3_DELETE_RECV;
@@ -571,8 +553,6 @@ gint pop3_logout_send(SockInfo *sock, gpointer data)
                g_strfreev(parts);      
        }
        
-       inc_progress_update(state, POP3_LOGOUT_SEND);
-
        pop3_gen_send(sock, "QUIT");
 
        return POP3_LOGOUT_RECV;

diff --git a/src/procmime.c b/src/procmime.c
index 9241d87b8b471c6b8fe1be5e485b659edede5191..186630393653a1426a4993550cb4b69d0e24ae6e 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1037,6 +1037,8 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
                        : mimeinfo->name ? mimeinfo->name : "mimetmp";
                base = g_basename(base);
                if (*base == '\0') base = "mimetmp";
+               Xstrdup_a(base, base, return NULL);
+               subst_for_filename(base);
        }
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,