talons

commit 0024fece31482b861e873c6f9a70c08e3dd3744c
parent d871af047d6c15da215968686fa725b904b4cabe
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 17 Aug 2008 07:00:37 +0000

2008-08-17 [colin]	3.5.0cvs62

	* src/prefs_actions.c
	* src/procmime.c
	* src/wizard.c
	* src/common/socket.h
	* src/gtk/gtkcmctree.c
		Fix warnings

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/socket.h
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
2
+-
M
src/prefs_actions.c
 | 
2
+-
M
src/procmime.c
 | 
2
+-
M
src/wizard.c
 | 
4
++++

8 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-17 [colin]	3.5.0cvs62
+
+	* src/prefs_actions.c
+	* src/procmime.c
+	* src/wizard.c
+	* src/common/socket.h
+	* src/gtk/gtkcmctree.c
+		Fix warnings
+
 2008-08-16 [colin]	3.5.0cvs61
 
 	* src/editaddress_other_attributes_ldap.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -3473,3 +3473,4 @@
 ( cvs diff -u -r 1.213.2.184 -r 1.213.2.185 src/folder.c;  cvs diff -u -r 1.5.2.53 -r 1.5.2.54 src/gtk/pluginwindow.c;  ) > 3.5.0cvs59.patchset
 ( cvs diff -u -r 1.274.2.266 -r 1.274.2.267 src/mainwindow.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.48 -r 1.1.4.49 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.81 -r 1.5.2.82 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkvscrollbutton.c;  ) > 3.5.0cvs60.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/editaddress_other_attributes_ldap.h;  ) > 3.5.0cvs61.patchset
+( cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/prefs_actions.c;  cvs diff -u -r 1.49.2.112 -r 1.49.2.113 src/procmime.c;  cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/wizard.c;  cvs diff -u -r 1.13.2.19 -r 1.13.2.20 src/common/socket.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs62.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/socket.h b/src/common/socket.h
@@ -78,7 +78,7 @@ struct _SockInfo
 	GIOCondition condition;
 	gchar *canonical_name;
 	
-	void *account;
+	const void *account;
 	gboolean is_smtp;
 };
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -3398,7 +3398,7 @@ row_delete (GtkCMCTree    *ctree,
 
 #if GLIB_CHECK_VERSION(2,10,0)  
   g_slice_free1 (sizeof (GtkCMCell) * clist->columns, ctree_row->row.cell);
-  g_slice_free (GtkCMCListRow, ctree_row);
+  g_slice_free (GtkCMCTreeRow, ctree_row);
 #else
   g_mem_chunk_free ((GMemChunk *)clist->cell_mem_chunk, ctree_row->row.cell);
   g_mem_chunk_free ((GMemChunk *)clist->row_mem_chunk, ctree_row);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -1217,7 +1217,7 @@ static void prefs_actions_select_row(GtkTreeView *list_view, GtkTreePath *path)
 		return;
 
 	*cmd = '\0';
-	ENTRY_SET_TEXT(actions.name_entry, buf);
+	gtk_entry_set_text(GTK_ENTRY(actions.name_entry), buf);
 
 	if(g_str_has_prefix(&cmd[2], "%as{") == TRUE)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
diff --git a/src/procmime.c b/src/procmime.c
@@ -976,7 +976,7 @@ gchar *procmime_get_mime_type(const gchar *filename)
 	static GHashTable *mime_type_table = NULL;
 	MimeType *mime_type;
 	const gchar *p;
-	gchar *ext = NULL, *ext_down;
+	gchar *ext = NULL;
 	gchar *base;
 
 	if (!mime_type_table) {
diff --git a/src/wizard.c b/src/wizard.c
@@ -1233,9 +1233,11 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
 	GtkWidget *table = gtk_table_new(1, 1, FALSE);
 	GtkWidget *vbox;
 	GtkWidget *hbox;
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 	GtkWidget *label;
 	GtkWidget *button;
 	GtkWidget *smtp_cert_table;
+#endif
 	gchar *text;
 	CLAWS_TIP_DECL();
 	
@@ -1471,9 +1473,11 @@ static GtkWidget* recv_page (WizardWindow * wizard)
 	GtkWidget *table = gtk_table_new(1,1, FALSE);
 	GtkWidget *vbox;
 	GtkWidget *hbox;
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 	GtkWidget *label;
 	GtkWidget *button;
 	GtkWidget *recv_cert_table;
+#endif
 	GtkListStore *store;
 	GtkTreeIter iter;
 	gchar *text;