2006-06-28 [wwp] 2.3.1cvs31

	* src/imap.c
	* src/prefs_folder_item.c
		less compilation warnings (thanks to Fabien Vantard), less typos.

diff --git a/ChangeLog b/ChangeLog
index bce85a8fff12baaafe2968939126c5a7abb1cd8d..871778652149a30a725ed74391f532955a5b19c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-28 [wwp]       2.3.1cvs31
+
+       * src/imap.c
+       * src/prefs_folder_item.c
+               less compilation warnings (thanks to Fabien Vantard), less typos.
+
 2006-06-28 [paul]      2.3.1cvs30
 
        * src/gtk/gtkutils.c

diff --git a/PATCHSETS b/PATCHSETS
index 3caab0703302ae9ed92ad3fd733159db7143fa4e..94e835df30b9a64e0cf6ef642d2caa93816f7884 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1631,3 +1631,4 @@
 ( cvs diff -u -r 1.396.2.713 -r 1.396.2.714 ChangeLog;  cvs diff -u -r 1.25.2.9 -r 1.25.2.10 tools/Makefile.am;  ) > 2.3.1cvs28.patchset
 ( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/prefs_ext_prog.c;  ) > 2.3.1cvs29.patchset
 ( cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/gtkutils.c;  ) > 2.3.1cvs30.patchset
+( cvs diff -u -r 1.179.2.122 -r 1.179.2.123 src/imap.c;  cvs diff -u -r 1.52.2.22 -r 1.52.2.23 src/prefs_folder_item.c;  ) > 2.3.1cvs31.patchset

diff --git a/configure.ac b/configure.ac
index bb2b96ebd74fba7f8e896fcd17dc56f8c1a3a44b..e33a94f00d40c490d103749ff80ccf11f7be388b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index 8cc02a9293abb1ef0645d4483b59621bc5ebb9ad..3d69188a53c72d8e504ba07477dc8abf61c35336 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3146,7 +3146,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                        *old_uids_valid = FALSE;
 
                        debug_print("Freeing imap uid cache (%d != %d)\n",
-                                       item->item.mtime, uid_val);
+                                       (int)item->item.mtime, uid_val);
                        item->lastuid = 0;
                        g_slist_free(item->uid_list);
                        item->uid_list = NULL;

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 8e2b9e1233fe6630308d0a7d1d8e8b00eb3fc902..a5904278b253bf3f8a1f9516dd1e6daece28eb7f 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -76,7 +76,7 @@ struct _FolderItemGeneralPage
        GtkWidget *checkbtn_newmailcheck;
        GtkWidget *checkbtn_offlinesync;
 
-       /* appy to sub folders */
+       /* apply to sub folders */
        GtkWidget *simplify_subject_rec_checkbtn;
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
@@ -139,7 +139,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                                   gpointer data)
 {
        FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
-       FolderItem *item = (FolderItem *) data, *parent;
+       FolderItem *item = (FolderItem *) data;
        guint rowcount;
 
 
@@ -391,7 +391,7 @@ void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
 /** \brief  Save the prefs in page to folder.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
@@ -769,7 +769,7 @@ void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
 /** \brief  Save the prefs in page to folder.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {