[evolution-patches] 62963, mail and smime lib, inline declarations

[Not Zed <notzed ximian com>]

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: smime/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/smime/ChangeLog,v
retrieving revision 1.40
diff -u -3 -r1.40 ChangeLog
--- smime/ChangeLog	12 Aug 2004 20:37:27 -0000	1.40
+++ smime/ChangeLog	16 Aug 2004 07:01:39 -0000
@@ -1,3 +1,10 @@
+2004-08-16  Not Zed  <NotZed Ximian com>
+
+	** See bug #62963.
+
+	* gui/cert-trust-dialog.c (ctd_response): fix c99 syntax. Spotted
+	by Vincent Noel <vnoel cox net>
+
 2004-08-12  Carlos Garnacho Parro  <carlosg gnome org>
 
 	* gui/certificate-manager.c: Optionally use GtkFileChooser if
Index: smime/gui/cert-trust-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/cert-trust-dialog.c,v
retrieving revision 1.1
diff -u -3 -r1.1 cert-trust-dialog.c
--- smime/gui/cert-trust-dialog.c	28 May 2004 07:52:37 -0000	1.1
+++ smime/gui/cert-trust-dialog.c	16 Aug 2004 07:01:39 -0000
@@ -79,11 +79,11 @@
 		CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust);
 		break;
 	case GTK_RESPONSE_ACCEPT: {
-		g_signal_stop_emission_by_name(w, "response");
-
 		/* just *what on earth* was chris thinking here!?!?!  copied from certificate-manager.c */
 		GtkWidget *dialog = ca_trust_dialog_show (data->cacert, FALSE);
 		CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
+
+		g_signal_stop_emission_by_name(w, "response");
 
 		ca_trust_dialog_set_trust (dialog,
 					   e_cert_trust_has_trusted_ca (icert->trust, TRUE,  FALSE, FALSE),
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3434
diff -u -3 -r1.3434 ChangeLog
--- mail/ChangeLog	16 Aug 2004 03:31:21 -0000	1.3434
+++ mail/ChangeLog	16 Aug 2004 07:01:42 -0000
@@ -1,3 +1,11 @@
+2004-08-16  Not Zed  <NotZed Ximian com>
+
+	** See bug #62963.
+
+	* message-list.c (build_tree, build_flat): define selected in
+	declaration block, not inline. Spotted by Vincent Noel
+	<vnoel cox net>
+
 2004-08-13  Not Zed  <NotZed Ximian com>
 
 	* em-utils.c (em_utils_message_to_html): don't include the
Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.396
diff -u -3 -r1.396 message-list.c
--- mail/message-list.c	28 Jul 2004 02:55:52 -0000	1.396
+++ mail/message-list.c	16 Aug 2004 07:01:43 -0000
@@ -2181,7 +2181,9 @@
 	ETreeModel *etm = ml->model;
 	ETreePath *top;
 	char *saveuid = NULL;
-
+#ifdef BROKEN_ETREE
+	GPtrArray *selected;
+#endif
 #ifdef TIMEIT
 	struct timeval start, end;
 	unsigned long diff;
@@ -2208,7 +2210,7 @@
 #ifndef BROKEN_ETREE
 	if (top == NULL || changes == NULL) {
 #else
-		GPtrArray *selected = message_list_get_selected(ml);
+		selected = message_list_get_selected(ml);
 #endif
 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
 		clear_tree (ml);
@@ -2507,7 +2509,9 @@
 	ETreePath node;
 	char *saveuid = NULL;
 	int i;
-
+#ifdef BROKEN_ETREE
+	GPtrArray *selected;
+#endif
 #ifdef TIMEIT
 	struct timeval start, end;
 	unsigned long diff;
@@ -2524,7 +2528,7 @@
 		build_flat_diff(ml, changes);
 	} else {
 #else
-		GPtrArray *selected = message_list_get_selected(ml);
+		selected = message_list_get_selected(ml);
 #endif
 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
 		clear_tree (ml);