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, 10 insertions, 12 deletions

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");