From b4dc5a35e5407ff6cea9f700333df196823ec798 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Wed, 19 Sep 2012 14:48:46 +0000
Subject: [PATCH 1/1] 2012-09-19 [colin]	3.8.1cvs64

	* src/mainwindow.c
		Check possible overflow
	* src/prefs_account.c
	* src/prefs_compose_writing.c
	* src/prefs_logging.c
	* src/prefs_message.c
	* src/prefs_msg_colors.c
	* src/prefs_other.c
	* src/prefs_receive.c
	* src/prefs_summaries.c
	* src/prefs_wrapping.c
		fix GtkAdjustment casts
	* src/common/ssl.c
		fix warnings
	* src/gtk/gtkaspell.c
		fix warnings
---
 ChangeLog                   | 19 +++++++++++++++++++
 PATCHSETS                   |  1 +
 configure.ac                |  2 +-
 src/common/ssl.c            |  5 +----
 src/gtk/gtkaspell.c         |  2 +-
 src/mainwindow.c            |  4 +++-
 src/prefs_account.c         |  2 +-
 src/prefs_compose_writing.c |  6 +++---
 src/prefs_logging.c         |  4 ++--
 src/prefs_message.c         |  4 ++--
 src/prefs_msg_colors.c      |  2 +-
 src/prefs_other.c           |  2 +-
 src/prefs_receive.c         |  2 +-
 src/prefs_summaries.c       |  4 ++--
 src/prefs_wrapping.c        |  2 +-
 15 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2bdeebe2..af0b2802b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-09-19 [colin]	3.8.1cvs64
+
+	* src/mainwindow.c
+		Check possible overflow
+	* src/prefs_account.c
+	* src/prefs_compose_writing.c
+	* src/prefs_logging.c
+	* src/prefs_message.c
+	* src/prefs_msg_colors.c
+	* src/prefs_other.c
+	* src/prefs_receive.c
+	* src/prefs_summaries.c
+	* src/prefs_wrapping.c
+		fix GtkAdjustment casts
+	* src/common/ssl.c
+		fix warnings
+	* src/gtk/gtkaspell.c
+		fix warnings
+
 2012-09-19 [mones]	3.8.1cvs63
 
 	* src/addritem.c
diff --git a/PATCHSETS b/PATCHSETS
index 395297991..7b888a2bd 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4438,3 +4438,4 @@
 ( cvs diff -u -r 1.179.2.261 -r 1.179.2.262 src/imap.c;  cvs diff -u -r 1.149.2.110 -r 1.149.2.111 src/inc.c;  cvs diff -u -r 1.101.2.71 -r 1.101.2.72 src/news.c;  cvs diff -u -r 1.17.2.64 -r 1.17.2.65 src/send_message.c;  cvs diff -u -r 1.13.2.49 -r 1.13.2.50 src/common/socket.c;  ) > 3.8.1cvs61.patchset
 ( cvs diff -u -r 1.12.2.74 -r 1.12.2.75 src/action.c;  cvs diff -u -r 1.22.2.29 -r 1.22.2.30 src/addrbook.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/addrclip.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/addrcustomattr.c;  cvs diff -u -r 1.60.2.150 -r 1.60.2.151 src/addressbook.c;  cvs diff -u -r 1.16.2.72 -r 1.16.2.73 src/msgcache.c;  cvs diff -u -r 1.96.2.248 -r 1.96.2.249 src/textview.c;  cvs diff -u -r 1.43.2.130 -r 1.43.2.131 src/toolbar.c;  ) > 3.8.1cvs62.patchset
 ( cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/addritem.c;  ) > 3.8.1cvs63.patchset
+( cvs diff -u -r 1.274.2.351 -r 1.274.2.352 src/mainwindow.c;  cvs diff -u -r 1.105.2.176 -r 1.105.2.177 src/prefs_account.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_logging.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_message.c;  cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_other.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_receive.c;  cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_wrapping.c;  cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/ssl.c;  cvs diff -u -r 1.9.2.82 -r 1.9.2.83 src/gtk/gtkaspell.c;  ) > 3.8.1cvs64.patchset
diff --git a/configure.ac b/configure.ac
index a0d927cd7..7a0507a09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
index 8d3ce866c..e64be3b38 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -266,9 +266,6 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 	if (session == NULL || r != 0)
 		return FALSE;
 
-#if GNUTLS_VERSION_NUMBER < 0x030003
-	gnutls_transport_set_lowat (session, 0); 
-#endif
 	if (method == 0)
 		gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-TLS1.2", NULL);
 	else
@@ -288,7 +285,7 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 	}
 	gnutls_certificate_set_verify_flags (xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
 
-	gnutls_transport_set_ptr(session, (gnutls_transport_ptr) sockinfo->sock);
+	gnutls_transport_set_ptr(session, (gnutls_transport_ptr) GINT_TO_POINTER(sockinfo->sock));
 	gnutls_session_set_ptr(session, sockinfo);
 	gnutls_certificate_client_set_retrieve_function(xcred, gnutls_client_cert_cb);
 
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index f2ca7b0a0..fce20c4bc 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -505,7 +505,7 @@ static gboolean key_press_cb			(GtkWidget    *text_view,
 		case GDK_KEY_Page_Down:
 		case GDK_KEY_End:
 		case GDK_KEY_Begin:
-			pos = get_textview_buffer_offset(text_view);
+			pos = get_textview_buffer_offset(GTK_TEXT_VIEW(text_view));
 			if (pos > 0)
 				check_at(gtkaspell, pos - 1);
 			else
diff --git a/src/mainwindow.c b/src/mainwindow.c
index b9de42583..fae2b4c1f 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3616,7 +3616,9 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded, gint maxlen)
 		buf++;
 		if (!strncmp(buf, "mailto:", strlen("mailto:")))
 			with_plus = FALSE;
-		for (i = 0; *buf != '>' && *buf != 0x00 && i<maxlen; tmp[i++] = *(buf++));
+		for (i = 0;
+		     *buf != '>' && *buf != 0x00 && i<maxlen && i < sizeof(tmp) - 1;
+			tmp[i++] = *(buf++));
 		buf++;
 	}
 	else  {
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 986d73412..2f47c7232 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1520,7 +1520,7 @@ static void receive_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
 
 	maxarticle_spinbtn_adj =
-		gtk_adjustment_new (300, 0, 10000, 10, 100, 0);
+		GTK_ADJUSTMENT(gtk_adjustment_new (300, 0, 10000, 10, 100, 0));
 	maxarticle_spinbtn = gtk_spin_button_new
 		(GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
 	gtk_widget_show (maxarticle_spinbtn);
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index ecb387e3e..624812151 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -147,7 +147,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
 			   _("Automatically save message to Drafts folder every"));
 
-	spinbtn_autosave_adj = gtk_adjustment_new (50, 0, 1000, 1, 10, 0);
+	spinbtn_autosave_adj = GTK_ADJUSTMENT(gtk_adjustment_new (50, 0, 1000, 1, 10, 0));
 	spinbtn_autosave_length = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_autosave_adj), 1, 0);
 	gtk_widget_set_size_request (spinbtn_autosave_length, 64, -1);	
@@ -168,7 +168,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	gtk_widget_show (label_undolevel);
 	gtk_box_pack_start (GTK_BOX (hbox_undolevel), label_undolevel, FALSE, FALSE, 0);
 
-	spinbtn_undolevel_adj = gtk_adjustment_new (50, 0, 100, 1, 10, 0);
+	spinbtn_undolevel_adj = GTK_ADJUSTMENT(gtk_adjustment_new (50, 0, 100, 1, 10, 0));
 	spinbtn_undolevel = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_undolevel_adj), 1, 0);
 	gtk_widget_show (spinbtn_undolevel);
@@ -184,7 +184,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	PACK_CHECK_BUTTON (hbox_warn_large_insert, checkbtn_warn_large_insert,
 			   _("Warn when inserting a file larger than"));
 
-	spinbtn_warn_large_insert_adj = gtk_adjustment_new (50, 0, 10000, 1, 10, 0);
+	spinbtn_warn_large_insert_adj = GTK_ADJUSTMENT(gtk_adjustment_new (50, 0, 10000, 1, 10, 0));
 	spinbtn_warn_large_insert_size = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_warn_large_insert_adj), 1, 0);
 	gtk_widget_set_size_request (spinbtn_warn_large_insert_size, 64, -1);	
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index a6523490f..d3b565297 100644
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -146,7 +146,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
 	PACK_CHECK_BUTTON (hbox_clip_network_log, checkbtn_clip_network_log,
 			   _("Restrict the log window to"));
 	
-	spinbtn_network_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0);
+	spinbtn_network_log_length_adj = GTK_ADJUSTMENT(gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0));
 	spinbtn_network_log_length = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_network_log_length_adj), 1, 0);
 	gtk_widget_show (spinbtn_network_log_length);
@@ -253,7 +253,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
 	PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
 			   _("Restrict the log window to"));
 	
-	spinbtn_filtering_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0);
+	spinbtn_filtering_log_length_adj = GTK_ADJUSTMENT(gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0));
 	spinbtn_filtering_log_length = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_filtering_log_length_adj), 1, 0);
 	gtk_widget_show (spinbtn_filtering_log_length);
diff --git a/src/prefs_message.c b/src/prefs_message.c
index 1bc4a1bee..c83af9efb 100644
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -177,7 +177,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
 			    FALSE, FALSE, 0);
 
-	spinbtn_linespc_adj = gtk_adjustment_new (2, 0, 16, 1, 1, 0);
+	spinbtn_linespc_adj = GTK_ADJUSTMENT(gtk_adjustment_new (2, 0, 16, 1, 1, 0));
 	spinbtn_linespc = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_linespc_adj), 1, 0);
 	gtk_widget_show (spinbtn_linespc);
@@ -210,7 +210,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_widget_show (label_scr);
 	gtk_box_pack_start (GTK_BOX (hbox_scr), label_scr, FALSE, FALSE, 0);
 
-	spinbtn_scrollstep_adj = gtk_adjustment_new (1, 1, 100, 1, 10, 0);
+	spinbtn_scrollstep_adj = GTK_ADJUSTMENT(gtk_adjustment_new (1, 1, 100, 1, 10, 0));
 	spinbtn_scrollstep = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_scrollstep_adj), 1, 0);
 	gtk_widget_show (spinbtn_scrollstep);
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index ac0bec803..f0d41d5f5 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -633,7 +633,7 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
 		}
 	}
 
-	color_dialog = GTK_COLOR_SELECTION_DIALOG(gtk_color_selection_dialog_new(title));
+	color_dialog = gtk_color_selection_dialog_new(title);
 	g_free(title);
 	gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
diff --git a/src/prefs_other.c b/src/prefs_other.c
index da92869c8..53d35665a 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -542,7 +542,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_widget_show (label_iotimeout);
 	gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
-	spinbtn_iotimeout_adj = gtk_adjustment_new (60, 0, 1000, 1, 10, 0);
+	spinbtn_iotimeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (60, 0, 1000, 1, 10, 0));
 	spinbtn_iotimeout = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_iotimeout_adj), 1, 0);
 	gtk_widget_show (spinbtn_iotimeout);
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index cc97ec661..0d885caf9 100644
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -162,7 +162,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
 	PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
 			   _("Check for new mail every"));
 
-	spinbtn_autochk_adj = gtk_adjustment_new (5, 1, 100, 1, 10, 0);
+	spinbtn_autochk_adj = GTK_ADJUSTMENT(gtk_adjustment_new (5, 1, 100, 1, 10, 0));
 	spinbtn_autochk = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_autochk_adj), 1, 0);
 	gtk_widget_show (spinbtn_autochk);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 7d0eddbb9..d9a3108be 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -385,7 +385,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_widget_show (label_ng_abbrev);
 	gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-	spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 0);
+	spinbtn_ng_abbrev_len_adj = GTK_ADJUSTMENT(gtk_adjustment_new (16, 0, 999, 1, 10, 0));
 	spinbtn_ng_abbrev_len = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
 	gtk_widget_show (spinbtn_ng_abbrev_len);
@@ -484,7 +484,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	hbox1 = gtk_hbox_new (FALSE, 8);
 	gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
 
-	spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 0);
+	spinbtn_mark_as_read_delay_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 60, 1, 10, 0));
 	spinbtn_mark_as_read_delay = gtk_spin_button_new
 			(GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
 	gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,
diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index 337b98a97..ed1bc2979 100644
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -90,7 +90,7 @@ static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_widget_show (label_linewrap);
 	gtk_box_pack_start (GTK_BOX (hbox1), label_linewrap, FALSE, FALSE, 4);
 
-	spinbtn_linewrap_adj = gtk_adjustment_new (72, 20, 1024, 1, 10, 0);
+	spinbtn_linewrap_adj = GTK_ADJUSTMENT(gtk_adjustment_new (72, 20, 1024, 1, 10, 0));
 	spinbtn_linewrap = gtk_spin_button_new
 		(GTK_ADJUSTMENT (spinbtn_linewrap_adj), 1, 0);
 	gtk_widget_set_size_request (spinbtn_linewrap, 64, -1);
-- 
2.25.1