aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-02-23 15:13:46 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-02-23 15:13:46 +0800
commit9846fa40159d79b1d9a9a1e8781558d9ecb40e36 (patch)
tree38401f715978ff382a6de0fc54d6727c19f6428a
parentb99aefd9cf67f95682f33a8ecfbaf9116756f777 (diff)
downloadgsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar.gz
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar.bz2
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar.lz
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar.xz
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.tar.zst
gsoc2013-evolution-9846fa40159d79b1d9a9a1e8781558d9ecb40e36.zip
fix argument order to memset. (emae_security_page): fix the non-have_nss
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. svn path=/trunk/; revision=28865
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-account-editor.c12
2 files changed, 10 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f84ca8f964..1ea189f19b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -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-22 Marco Pesenti Gritti <marco@gnome.org>
* mail/em-popup.c: (emp_apps_open_in), (emp_standard_menu_factory):
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index ac191caef5..614c234195 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -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 *item, struct _GtkWidget *parent, struct
/* 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, EConfigItem *item, struct _GtkWidget *parent, st
/* Since we don't have NSS, hide the S/MIME config options */
GtkWidget *frame;
- frame = glade_xml_get_widget (xml, "smime_vbox");
- gtk_widget_destroy (frame);
+ frame = glade_xml_get_widget(xml, "smime_vbox");
+ gtk_widget_destroy(frame);
}
#endif /* HAVE_NSS */