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

1 files changed, 7 insertions, 6 deletions

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;
 };