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, 2 insertions, 2 deletions

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;