cast warning away.

2005-08-23  Not Zed  <NotZed@Ximian.com>

        * 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

7 files changed, 49 insertions, 24 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9bb0d090dc..02f4033244 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,25 @@
+2005-08-23  Not Zed  <NotZed@Ximian.com>
+
+	* 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.
+
 2005-08-19  Not Zed  <NotZed@Ximian.com>
 
 	** See #312668.
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;
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index c9340f3aa2..3b66e882be 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -738,13 +738,13 @@ efhd_xpkcs7mime_info_response(GtkWidget *w, guint button, struct _smime_pobject
 	po->widget = NULL;
 }
 
+#ifdef HAVE_NSS
 static void
 efhd_xpkcs7mime_viewcert_foad(GtkWidget *w, guint button, struct _smime_pobject *po)
 {
 	gtk_widget_destroy(w);
 }
 
-#ifdef HAVE_NSS
 static void
 efhd_xpkcs7mime_viewcert_clicked(GtkWidget *button, struct _smime_pobject *po)
 {
@@ -1772,7 +1772,7 @@ efhd_bar_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpoint
 	if (selection == NULL)
 		return;
 	
-	image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
+	image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data));
 	if (image == NULL)
 		return;
 	
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 2265fc3560..af61459f4d 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -89,7 +89,7 @@ em_junk_check_junk(CamelJunkPlugin *csp, CamelMimeMessage *m)
 			  m
 		};
 
-		return (gboolean)(e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target));
+		return e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target) != NULL;
 	}
 
 	return FALSE;
@@ -170,21 +170,19 @@ static struct _EMJunkHookItem *
 emjh_construct_item(EPluginHook *eph, EMJunkHookGroup *group, xmlNodePtr root)
 {
 	struct _EMJunkHookItem *item; 
-	EMJunk junk_plugin = {
-		{
-			em_junk_get_name,
-			1,
-			em_junk_check_junk,
-			em_junk_report_junk,
-			em_junk_report_non_junk,
-			em_junk_commit_reports,
-			em_junk_init,
-		}
+	CamelJunkPlugin junk_plugin = {
+		em_junk_get_name,
+		1,
+		em_junk_check_junk,
+		em_junk_report_junk,
+		em_junk_report_non_junk,
+		em_junk_commit_reports,
+		em_junk_init,
 	};
 
 	d(printf("  loading group item\n"));
 	item = g_malloc0(sizeof(*item));
-	item->csp =  junk_plugin.csp;
+	item->csp =  junk_plugin;
 	item->check_junk = e_plugin_xml_prop(root, "check_junk");
 	item->report_junk = e_plugin_xml_prop(root, "report_junk");
 	item->report_non_junk = e_plugin_xml_prop(root, "report_non_junk");
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 9a81dc1803..378277b3f9 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -20,14 +20,13 @@
  *
  */
 
-#ifndef __EM_FORMAT_HOOK_H__
-#define __EM_FORMAT_HOOK_H__
+#ifndef __EM_JUNK_HOOK_H__
+#define __EM_JUNK_HOOK_H__
 
-#include <glib-object.h>
-#include "libedataserver/e-msgport.h"
 #include "e-util/e-plugin.h"
+
 #include <camel/camel-junk-plugin.h>
-#include <camel/camel-mime-message.h>
+
 #ifdef __cplusplus
 extern "C" {
 #pragma }
@@ -45,7 +44,7 @@ typedef struct _EMJunkHookTarget EMJunkHookTarget;
 typedef void (*EMJunkHookFunc)(struct _EPlugin *plugin, EMJunkHookTarget *data);
 
 struct _EMJunkHookTarget {
-	CamelMimeMessage *m;
+	struct _CamelMimeMessage *m;
 };
 
 struct _EMJunkHookItem {
@@ -79,6 +78,8 @@ GType em_junk_hook_get_type(void);
 void em_junk_hook_register_type(GType type);
 
 struct _EMJunk {
+	GObject object;
+
         CamelJunkPlugin csp;
 };
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 72a54c6177..7cfc651989 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -43,6 +43,8 @@
 #include <camel/camel-offline-store.h>
 #include <camel/camel-disco-store.h>
 
+#include "e-util/e-util.h"
+
 #include "mail-mt.h"
 #include "mail-folder-cache.h"
 #include "mail-ops.h"
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 761c425be7..3a6eb1b109 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -293,7 +293,7 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex)
 		return NULL;
 	}
 
-	store = camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
+	store = (CamelStore *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
 	if (store) {
 		const char *name;