[evolution-patches] 61363, mail, extra fixes

[Not Zed <notzed ximian com>]

some extra fixes to the last patch



? mail/ems.diff
? mail/evolution-mail-2.0.schemas
? mail/m.diff
? mail/ma.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3577
diff -u -p -r1.3577 ChangeLog
--- mail/ChangeLog	21 Feb 2005 06:37:13 -0000	1.3577
+++ mail/ChangeLog	22 Feb 2005 08:10:47 -0000
@@ -1,3 +1,9 @@
+2005-02-22  Not Zed  <NotZed Ximian com>
+
+	* em-account-editor.c (emae_send_page): fix argument order to
+	memset.
+	(emae_security_page): fix the non-have_nss case.
+
 2005-02-14  Not Zed  <NotZed Ximian com>
 
 	** See bug #61363 & e-util/ChangeLog
Index: mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.19
diff -u -p -r1.19 em-account-editor.c
--- mail/em-account-editor.c	21 Feb 2005 06:37:13 -0000	1.19
+++ mail/em-account-editor.c	22 Feb 2005 08:10:48 -0000
@@ -103,6 +103,7 @@ struct _receive_options_item {
 typedef struct _EMAccountEditorService {
 	EMAccountEditor *emae;	/* parent pointer, for callbacks */
 
+	/* NOTE: keep all widgets together, first frame last check_dialog */
 	struct _GtkWidget *frame;
 	struct _GtkWidget *container;
 
@@ -2016,15 +2017,10 @@ emae_send_page(EConfig *ec, EConfigItem 
 
 	/* no transport options page at all for these types of providers */
 	if (gui->source.provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(gui->source.provider)) {
-		memset(&gui->transport.frame, &gui->transport.check_dialog-&gui->transport.frame, 0);
+		memset(&gui->transport.frame, 0, ((char *)&gui->transport.check_dialog)-((char *)&gui->transport.frame));
 		return NULL;
 	}
 
-#if 0
-	if (old)
-		return old;
-#endif
-
 	xml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", item->label, NULL);
 
 	/* Transport */
@@ -2138,8 +2134,8 @@ emae_security_page(EConfig *ec, EConfigI
 		/* Since we don't have NSS, hide the S/MIME config options */
 		GtkWidget *frame;
 		
-		frame = glade_xml_get_widget (gui->xml, "smime_vbox");
-		gtk_widget_destroy (frame);
+		frame = glade_xml_get_widget(xml, "smime_vbox");
+		gtk_widget_destroy(frame);
 	}
 #endif /* HAVE_NSS */