2007-01-21 [colin] 2.7.1cvs47
authorColin Leroy <colin@colino.net>
Sun, 21 Jan 2007 15:10:54 +0000 (15:10 +0000)
committerColin Leroy <colin@colino.net>
Sun, 21 Jan 2007 15:10:54 +0000 (15:10 +0000)
* src/procmsg.c
* src/procmsg.h
Same

ChangeLog
PATCHSETS
configure.ac
src/procmsg.c
src/procmsg.h

index 11191dd15ac7c729a114fa847f51d9f677223267..7c516d9c7e7626cbf7cef2a82911c3e52a9d1dee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-21 [colin]     2.7.1cvs47
+
+       * src/procmsg.c
+       * src/procmsg.h
+               Same
+
 2007-01-21 [colin]     2.7.1cvs46
 
        * src/common/socket.c
index e233cfd916758fd935a543e828211e5ef09d5c46..b582b3ae377481280493663f30a9a7157fb4dcc0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.36.2.96 -r 1.36.2.97 src/common/utils.c;  cvs diff -u -r 1.20.2.43 -r 1.20.2.44 src/common/utils.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager.h;  ) > 2.7.1cvs44.patchset
 ( cvs diff -u -r 1.23.2.20 -r 1.23.2.21 src/crash.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/exporthtml.c;  cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/exporthtml.h;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/exportldif.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.h;  cvs diff -u -r 1.213.2.132 -r 1.213.2.133 src/folder.c;  cvs diff -u -r 1.87.2.36 -r 1.87.2.37 src/folder.h;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.h;  cvs diff -u -r 1.207.2.145 -r 1.207.2.146 src/folderview.c;  cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/folderview.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gedit-print.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gedit-print.h;  cvs diff -u -r 1.115.2.129 -r 1.115.2.130 src/main.c;  cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/main.h;  cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.c;  cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/common/socket.h;  cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkaspell.h;  cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.h;  ) > 2.7.1cvs45.patchset
 ( cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.c;  cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/common/socket.h;  ) > 2.7.1cvs46.patchset
+( cvs diff -u -r 1.150.2.88 -r 1.150.2.89 src/procmsg.c;  cvs diff -u -r 1.60.2.38 -r 1.60.2.39 src/procmsg.h;  ) > 2.7.1cvs47.patchset
index e6a17f39c97323bc2fbe99f6645840310971d014..568227211359e9e4437e518342dcf49cd481ffa7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 2dd93f192bad13abccb2fd4121873a67f9016be5..e1c7e1f0b0d6c6cd32e922f083fbaa76a4bcfa69 100644 (file)
@@ -50,7 +50,8 @@
 
 static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
                                            FolderItem *queue, gint msgnum, gboolean *queued_removed);
-
+static void procmsg_update_unread_children     (MsgInfo        *info,
+                                        gboolean        newly_marked);
 enum
 {
        Q_SENDER           = 0,
@@ -72,67 +73,6 @@ enum
        Q_CLAWS_HDRS_OLD     = 16,
 };
 
-GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
-{
-       GHashTable *msg_table;
-
-       if (mlist == NULL) return NULL;
-
-       msg_table = g_hash_table_new(NULL, g_direct_equal);
-       procmsg_msg_hash_table_append(msg_table, mlist);
-
-       return msg_table;
-}
-
-void procmsg_msg_hash_table_append(GHashTable *msg_table, GSList *mlist)
-{
-       GSList *cur;
-       MsgInfo *msginfo;
-
-       if (msg_table == NULL || mlist == NULL) return;
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-
-               g_hash_table_insert(msg_table,
-                                   GUINT_TO_POINTER(msginfo->msgnum),
-                                   msginfo);
-       }
-}
-
-GHashTable *procmsg_to_folder_hash_table_create(GSList *mlist)
-{
-       GHashTable *msg_table;
-       GSList *cur;
-       MsgInfo *msginfo;
-
-       if (mlist == NULL) return NULL;
-
-       msg_table = g_hash_table_new(NULL, g_direct_equal);
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               g_hash_table_insert(msg_table, msginfo->to_folder, msginfo);
-       }
-
-       return msg_table;
-}
-
-gint procmsg_get_last_num_in_msg_list(GSList *mlist)
-{
-       GSList *cur;
-       MsgInfo *msginfo;
-       gint last = 0;
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               if (msginfo && msginfo->msgnum > last)
-                       last = msginfo->msgnum;
-       }
-
-       return last;
-}
-
 void procmsg_msg_list_free(GSList *mlist)
 {
        GSList *cur;
@@ -711,7 +651,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
        }
 }
 
-void procmsg_empty_trash(FolderItem *trash)
+static void procmsg_empty_trash(FolderItem *trash)
 {
        GNode *node, *next;
 
@@ -1073,7 +1013,7 @@ gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
        return 0;
 }
 
-gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
+static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                            gboolean is_queued)
 {
        gint num;
@@ -1453,19 +1393,6 @@ guint procmsg_msginfo_memusage(MsgInfo *msginfo)
        return memusage;
 }
 
-gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
-{
-       const MsgInfo *msginfo1 = a;
-       const MsgInfo *msginfo2 = b;
-
-       if (!msginfo1)
-               return -1;
-       if (!msginfo2)
-               return -1;
-
-       return msginfo1->msgnum - msginfo2->msgnum;
-}
-
 static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
                                            FolderItem *queue, gint msgnum, gboolean *queued_removed)
 {
@@ -2113,7 +2040,7 @@ static GSList *procmsg_find_children_func(MsgInfo *info,
        return children;
 }
 
-GSList *procmsg_find_children (MsgInfo *info)
+static GSList *procmsg_find_children (MsgInfo *info)
 {
        GSList *children;
        GSList *all, *cur;
@@ -2133,7 +2060,7 @@ GSList *procmsg_find_children (MsgInfo *info)
        return children;
 }
 
-void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
+static void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
 {
        GSList *children = procmsg_find_children(info);
        GSList *cur;
@@ -2177,7 +2104,7 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
  * \return TRUE if the message was moved and MsgInfo is now invalid,
  *         FALSE otherwise
  */
-gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
+static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
 {
        MailFilteringData mail_filtering_data;
                        
index 496eb558fc33d9aba4a057af06eeee1da05a537c..bbd9531a82c8065f069ee87c1a42a69afaba9a9b 100644 (file)
@@ -266,14 +266,8 @@ struct _MailFilteringData
        GSList  *unfiltered;
 };
 
-GHashTable *procmsg_msg_hash_table_create      (GSList         *mlist);
-void procmsg_msg_hash_table_append             (GHashTable     *msg_table,
-                                                GSList         *mlist);
-GHashTable *procmsg_to_folder_hash_table_create        (GSList         *mlist);
-
 GSList *procmsg_read_cache             (FolderItem     *item,
                                         gboolean        scan_file);
-gint   procmsg_get_last_num_in_msg_list(GSList         *mlist);
 void   procmsg_msg_list_free           (GSList         *mlist);
 void   procmsg_get_mark_sum            (const gchar    *folder,
                                         gint           *new_msgs,
@@ -304,16 +298,12 @@ void      procmsg_get_filter_keyword      (MsgInfo          *msginfo,
                                         gchar           **key,
                                         PrefsFilterType   type);
 
-void   procmsg_empty_trash             (FolderItem     *trash);
 void   procmsg_empty_all_trash         (void);
 
 gint   procmsg_send_queue              (FolderItem     *queue,
                                         gboolean        save_msgs,
                                         gchar          **errstr);
 gboolean procmsg_queue_is_empty        (FolderItem *queue);
-gint   procmsg_save_to_outbox          (FolderItem     *outbox,
-                                        const gchar    *file,
-                                        gboolean        is_queued);
 void   procmsg_print_message           (MsgInfo        *msginfo,
                                         const gchar    *cmdline);
 
@@ -324,8 +314,6 @@ MsgInfo *procmsg_msginfo_get_full_info      (MsgInfo        *msginfo);
 void    procmsg_msginfo_free           (MsgInfo        *msginfo);
 guint   procmsg_msginfo_memusage       (MsgInfo        *msginfo);
 
-gint procmsg_cmp_msgnum_for_sort       (gconstpointer   a,
-                                        gconstpointer   b);
 gint procmsg_send_message_queue                (const gchar *file,
                                         gchar **errstr,
                                         FolderItem *queue, 
@@ -349,13 +337,8 @@ gint procmsg_remove_special_headers        (const gchar    *in,
 gboolean procmsg_msg_has_flagged_parent        (MsgInfo        *info,
                                         MsgPermFlags    perm_flags);
 gboolean procmsg_msg_has_marked_parent (MsgInfo        *info);
-GSList *procmsg_find_children          (MsgInfo        *info);
-void procmsg_update_unread_children    (MsgInfo        *info,
-                                        gboolean        newly_marked);
 void procmsg_msginfo_set_to_folder     (MsgInfo        *msginfo,
                                         FolderItem     *to_folder);
-gboolean procmsg_msginfo_filter                (MsgInfo        *msginfo,
-                                        PrefsAccount   *ac_prefs);
 void procmsg_msglist_filter            (GSList         *list, 
                                         PrefsAccount   *ac, 
                                         GSList         **filtered,