From 8c8922a3083671463819815e2d882871566b4dcf Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 24 Aug 2005 03:05:26 +0000 Subject: cast warning away. 2005-08-23 Not Zed * mail-tools.c (mail_tool_uri_to_folder): cast warning away. * mail-folder-cache.c: include missing header for e_filename_make_safe. * em-junk-hook.h: Fix some header includes, fix the include guard to use the right name. (EMJunk): Ugh, this is an object, properly derive from it! How did this work? * em-junk-hook.c (em_junk_check_junk): fix bool conversion. * em-format-html-display.c (efhd_bar_popup_position): another wraning, why this crap isn't in the attachment bar like i said it should be, i'll never know. (efhd_xpkcs7mime_viewcert_foad): only define if used. * em-account-editor.c (emae_defaults_page): attempt to fix parentheses (emae_security_page): fix conditional compilation warnings. svn path=/trunk/; revision=30214 --- mail/em-account-editor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mail/em-account-editor.c') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index db6daf59bb..4f0e8fe7d6 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2151,9 +2151,9 @@ emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st && ( emae->priv->source.provider && !(emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))); gtk_widget_set_sensitive((GtkWidget *)gui->restore_folders_button, - (e_account_writable(emae->account, E_ACCOUNT_SENT_FOLDER_URI) && - ( emae->priv->source.provider && ! ( emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) || - e_account_writable(emae->account, E_ACCOUNT_DRAFTS_FOLDER_URI))); + (e_account_writable(emae->account, E_ACCOUNT_SENT_FOLDER_URI) + && ((emae->priv->source.provider && !( emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) + || e_account_writable(emae->account, E_ACCOUNT_DRAFTS_FOLDER_URI)))); /* Receipt policy */ emae_setup_receipt_policy (emae, xml); @@ -2172,7 +2172,9 @@ static GtkWidget * emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) { EMAccountEditor *emae = data; +#if defined (HAVE_NSS) EMAccountEditorPrivate *gui = emae->priv; +#endif GtkWidget *w; GladeXML *xml; -- cgit