Warning fixes: - NULL vs. 0 vs FALSE - ANSIfication of function

2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>

	* e-searching-tokenizer.c: (build_trie), (searcher_new),
	(output_token), (output_match), (merge_subpending),
	(searcher_next_token):
	* em-account-editor.c: (em_account_editor_new), (emae_load_text),
	(emae_check_license), (emae_auto_detect), (smime_sign_key_select),
	(smime_encrypt_key_select), (emae_service_url_path_changed),
	(emae_ssl_changed), (emae_service_provider_changed),
	(emae_refresh_providers), (emae_refresh_authtype),
	(emae_setup_service), (emae_identity_page):
	* em-composer-utils.c: (em_utils_send_receipt),
	(generate_account_hash), (em_utils_camel_address_to_destination),
	(reply_get_composer):
	* em-config.c: (em_config_new):
	* em-event.c: (em_event_peek):
	* em-filter-rule.c: (get_widget):
	* em-folder-browser.c: (generate_viewoption_menu),
	(em_folder_browser_show_preview), (get_view_query),
	(vfolder_setup_do), (emfb_search_search_activated),
	(emfb_list_key_press), (emfb_list_built):
	* em-folder-view.c: (em_folder_view_new),
	(emfv_setup_view_instance), (emfv_popup_forward),
	(emp_uri_popup_vfolder_sender), (emp_uri_popup_vfolder_recipient),
	(emfv_enable_menus):
	* em-format-hook.c:
	* em-format-html-display.c: (efhd_attachment_optional):
	* em-format-html.c: (em_format_html_new),
	(em_format_html_add_pobject), (em_format_html_find_pobject),
	(em_format_html_find_pobject_func), (efh_text_enriched),
	(efh_multipart_related), (efh_format_address), (efh_format_header):
	* em-icon-stream.h:
	* em-inline-filter.c: (emif_add_part), (emif_scan):
	* em-junk-hook.c: (emjh_construct_group):
	* em-mailer-prefs.c: (junk_plugin_setup):
	* em-menu.c: (em_menu_new), (em_menu_target_new_select):
	* em-message-browser.c: (em_message_browser_new):
	* em-popup.c: (em_popup_new), (em_popup_target_new_select):
	* em-sync-stream.c:
	* em-utils.c: (em_utils_save_part_to_file), (tag_editor_response),
	(em_utils_read_messages_from_stream), (em_utils_get_proxy_uri),
	(em_utils_in_addressbook):
	* em-vfolder-rule.c: (validate):
	* importers/elm-importer.c:
	* importers/mail-importer.c: (import_mbox_import),
	(import_folders_rec):
	* importers/pine-importer.c:
	* mail-component.c: (setline_done):
	* mail-folder-cache.c: (flush_updates):
	* mail-mt.c: (mail_msg_new), (checkmem), (mail_msg_check_error),
	(mail_msg_cancel), (mail_msg_wait), (mail_msg_init),
	(do_op_status):
	* mail-send-recv.c: (receive_status), (receive_done),
	(refresh_folders_get):
	* mail-vfolder.c: (mail_vfolder_get_sources_local),
	(mail_vfolder_get_sources_remote), (context_rule_added),
	(store_folder_renamed):
	* message-list.c: (e_mail_address_new), (e_mail_address_compare),
	(get_normalised_string), (ml_search_forward), (ml_search_backward),
	(ml_search_path), (message_list_select_uid),
	(thread_select_foreach), (message_list_copy), (ml_duplicate_value),
	(ml_free_value), (ml_initialize_value), (ml_value_is_empty),
	(ml_value_to_string), (subtree_latest), (sanitize_recipients),
	(ml_tree_value_at), (ml_tree_sort_value_at),
	(message_list_init_images), (filter_date), (build_tree),
	(build_flat_diff), (regen_list_regen):

	Warning fixes:
	- NULL vs. 0 vs FALSE
	- ANSIfication of function declarations
	- Remove unused bits
	- use unsigned ints for 1-bit bitfields
	- invalid pointer type
	- mark a global var static
	- mixing code and declarations

svn path=/trunk/; revision=34449

1 files changed, 17 insertions, 17 deletions

diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index c5a5347fdb..036cf570e3 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -2470,7 +2470,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	struct _attach_puri *info;
 	GtkWidget *hbox, *vbox, *button, *mainbox, *scroll, *label, *img;
 	AtkObject *a11y;
-	GtkTextView *view;
+	GtkWidget *view;
 	GtkTextBuffer *buffer;
 
 	/* FIXME: handle default shown case */
@@ -2490,27 +2490,27 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	img = e_icon_factory_get_image ("stock_show-all", E_ICON_SIZE_BUTTON);
 	label = gtk_label_new_with_mnemonic(_("View _Unformatted"));
 	g_object_set_data (G_OBJECT (button), "text-label", (gpointer)label);
-	gtk_box_pack_start ((GtkBox *)hbox, img, TRUE, TRUE, 2);
-	gtk_box_pack_start ((GtkBox *)hbox, label, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);
 	gtk_widget_show_all (hbox);
 	gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (hbox));
 	if (info->handle)
-		g_signal_connect(button, "clicked", G_CALLBACK(efhd_optional_button_show), scroll);
+		g_signal_connect(G_OBJECT (button), "clicked", G_CALLBACK(efhd_optional_button_show), scroll);
 	else {
 		gtk_widget_set_sensitive(button, FALSE);
 		GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 	}
 	
 	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start((GtkBox *)mainbox, button, FALSE, FALSE, 6);
+	gtk_box_pack_start(GTK_BOX (mainbox), button, FALSE, FALSE, 6);
 
 	button = gtk_button_new();
 	hbox = gtk_hbox_new (FALSE, 0);
 	img = e_icon_factory_get_image ("stock_open", E_ICON_SIZE_BUTTON);
 	label = gtk_label_new_with_mnemonic(_("O_pen With"));
-	gtk_box_pack_start ((GtkBox *)hbox, img, TRUE, TRUE, 2);
-	gtk_box_pack_start ((GtkBox *)hbox, label, TRUE, TRUE, 2);
-	gtk_box_pack_start ((GtkBox *)hbox, gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE), TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE), TRUE, TRUE, 2);
 	gtk_widget_show_all (hbox);
 	gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (hbox));
 	
@@ -2520,16 +2520,16 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	g_signal_connect(button, "button_press_event", G_CALLBACK(efhd_attachment_popup), info);
 	g_signal_connect(button, "popup_menu", G_CALLBACK(efhd_attachment_popup_menu), info);
 	g_signal_connect(button, "clicked", G_CALLBACK(efhd_attachment_popup_menu), info);
-	gtk_box_pack_start((GtkBox *)mainbox, button, FALSE, FALSE, 6);
+	gtk_box_pack_start(GTK_BOX (mainbox), button, FALSE, FALSE, 6);
 
 	gtk_widget_show_all(mainbox);
 
-	gtk_box_pack_start((GtkBox *)vbox, mainbox, FALSE, FALSE, 6);
+	gtk_box_pack_start(GTK_BOX (vbox), mainbox, FALSE, FALSE, 6);
 
-	view = (GtkTextView *)gtk_text_view_new ();
-	gtk_text_view_set_editable (view, FALSE);
-	gtk_text_view_set_cursor_visible (view, FALSE);
-	buffer = gtk_text_view_get_buffer(view);
+	view = gtk_text_view_new ();
+	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (view));
 	gtk_text_buffer_set_text (buffer, (char *)info->mstream->buffer->data, info->mstream->buffer->len);
 	camel_object_unref(info->mstream);
 	info->mstream = NULL;
@@ -2537,10 +2537,10 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
 	gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (view));
-	gtk_box_pack_start((GtkBox *)vbox, scroll, TRUE, TRUE, 6);
+	gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 6);
 	gtk_widget_show (GTK_WIDGET(view));
 
-	gtk_widget_set_size_request (scroll, ((GtkWidget *)efh->html)->allocation.width-48, 250);
+	gtk_widget_set_size_request (scroll, (GTK_WIDGET (efh->html))->allocation.width - 48, 250);
 	g_signal_connect (scroll, "size_allocate", G_CALLBACK(efhd_resize), efh);
 	gtk_widget_show (scroll);
 
@@ -2548,7 +2548,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 		gtk_widget_hide (scroll);
 	
 	gtk_widget_show (vbox);
-	gtk_container_add((GtkContainer *)eb, vbox);
+	gtk_container_add(GTK_CONTAINER (eb), vbox);
 	info->handle = NULL;
 
 	return TRUE;