2006-07-06 [colin] 2.3.1cvs65
authorColin Leroy <colin@colino.net>
Thu, 6 Jul 2006 16:34:05 +0000 (16:34 +0000)
committerColin Leroy <colin@colino.net>
Thu, 6 Jul 2006 16:34:05 +0000 (16:34 +0000)
* src/folder.c
Set summary update flag whenever
totals changed
* src/imap.c
* src/prefs_account.c
* src/common/utils.h
* src/etpan/imap-thread.c
Fix warnings, thanks to Fabien and
Ricardo

ChangeLog
PATCHSETS
configure.ac
src/common/utils.h
src/etpan/imap-thread.c
src/folder.c
src/imap.c
src/prefs_account.c

index e996f71..71bbec3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-06 [colin]     2.3.1cvs65
+
+       * src/folder.c
+               Set summary update flag whenever
+               totals changed
+       * src/imap.c
+       * src/prefs_account.c
+       * src/common/utils.h
+       * src/etpan/imap-thread.c
+               Fix warnings, thanks to Fabien and
+               Ricardo
+
 2006-07-06 [wwp]       2.3.1cvs64
 
        * src/gtk/gtkutils.c
index 21fe355..be0ed95 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.122 -r 1.96.2.123 src/textview.c;  ) > 2.3.1cvs62.patchset
 ( cvs diff -u -r 1.61.2.46 -r 1.61.2.47 src/account.c;  cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/addressbook.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/addressitem.h;  cvs diff -u -r 1.207.2.108 -r 1.207.2.109 src/folderview.c;  cvs diff -u -r 1.274.2.123 -r 1.274.2.124 src/mainwindow.c;  cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/manual.c;  cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/manual.h;  cvs diff -u -r 1.3.12.15 -r 1.3.12.16 src/message_search.c;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/prefs_actions.c;  cvs diff -u -r 1.59.2.35 -r 1.59.2.36 src/prefs_filtering.c;  cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/prefs_filtering.h;  cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/prefs_template.c;  cvs diff -u -r 1.15.2.29 -r 1.15.2.30 src/summary_search.c;  cvs diff -u -r 1.395.2.222 -r 1.395.2.223 src/summaryview.c;  cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/pluginwindow.c;  ) > 2.3.1cvs63.patchset
 ( cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/gtkutils.c;  ) > 2.3.1cvs64.patchset
+( cvs diff -u -r 1.213.2.103 -r 1.213.2.104 src/folder.c;  cvs diff -u -r 1.179.2.126 -r 1.179.2.127 src/imap.c;  cvs diff -u -r 1.105.2.62 -r 1.105.2.63 src/prefs_account.c;  cvs diff -u -r 1.20.2.33 -r 1.20.2.34 src/common/utils.h;  cvs diff -u -r 1.1.4.44 -r 1.1.4.45 src/etpan/imap-thread.c;  ) > 2.3.1cvs65.patchset
index 62638da..1281845 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9cc3f27..917f09e 100644 (file)
@@ -409,6 +409,7 @@ const gchar *get_template_dir               (void);
 const gchar *get_header_cache_dir      (void);
 const gchar *get_plugin_dir             (void);
 const gchar *get_tmp_dir               (void);
+const gchar *get_locale_dir            (void);
 gchar *get_tmp_file                    (void);
 const gchar *get_domain_name           (void);
 
index 305d259..692ccfc 100644 (file)
@@ -374,7 +374,7 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
                g_warning("no cert presented.\n");
                return 0;
        }
-       cert = d2i_X509(NULL, &certificate, len);
+       cert = d2i_X509(NULL, (unsigned char **) &certificate, len);
        if (cert == NULL) {
                g_warning("can't get cert\n");
                return 0;
index 19dae84..acdb51a 100644 (file)
@@ -2013,6 +2013,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                g_hash_table_destroy(subject_table);
        }
        
+       if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
+       ||  item->total_msgs != totalcnt || item->marked_msgs != markedcnt
+       ||  item->unreadmarked_msgs != unreadmarkedcnt) {
+               update_flags |= F_ITEM_UPDATE_CONTENT;
+       }
+
        item->new_msgs = newcnt;
        item->unread_msgs = unreadcnt;
        item->total_msgs = totalcnt;
index 29bbad6..f743196 100644 (file)
@@ -682,7 +682,6 @@ static IMAPSession *imap_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
        IMAPSession *session = NULL;
-       static time_t last_failure = 0;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL);
@@ -704,12 +703,12 @@ static IMAPSession *imap_session_get(Folder *folder)
                } */
        } else {
                imap_reset_uid_lists(folder);
-               if (time(NULL) - last_failure <= 2)
+               if (time(NULL) - rfolder->last_failure <= 2)
                        return NULL;
                session = imap_session_new(folder, folder->account);
        }
        if(session == NULL) {
-               last_failure = time(NULL);
+               rfolder->last_failure = time(NULL);
                return NULL;
        }
 
@@ -720,7 +719,7 @@ static IMAPSession *imap_session_get(Folder *folder)
        if (!IMAP_SESSION(session)->authenticated) {
                session_destroy(SESSION(session));
                rfolder->session = NULL;
-               last_failure = time(NULL);
+               rfolder->last_failure = time(NULL);
                return NULL;
        }
 
@@ -4263,7 +4262,7 @@ void imap_disconnect_all(void)
                        if (folder && folder->session) {
                                IMAPSession *session = (IMAPSession *)folder->session;
                                imap_threaded_disconnect(FOLDER(folder));
-                               session_destroy(session);
+                               session_destroy(SESSION(session));
                                folder->session = NULL;
                        }
                }
index 16bf362..856aef2 100644 (file)
@@ -2480,8 +2480,10 @@ static gint prefs_account_apply(void)
        RecvProtocol protocol;
        gchar *old_id = NULL;
        gchar *new_id = NULL;
-       
-       protocol = combobox_get_active_data(GTK_COMBO_BOX(basic.protocol_optmenu));
+       struct BasicProtocol *protocol_optmenu = (struct BasicProtocol *) basic.protocol_optmenu;
+       GtkWidget *optmenu = protocol_optmenu->combobox;
+
+       protocol = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
 
        if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
                alertpanel_error(_("Account name is not entered."));