Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of declarations - guint

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

	* e-component-registry.c: (query_components):
	* e-component-view.c: (e_component_view_new),
	(e_component_view_new_controls), (e_component_view_set_title),
	(e_component_view_set_button_icon):
	* e-config-upgrade.c:
	* e-shell-settings-dialog.c: (e_shell_settings_dialog_new):
	* e-shell-window.c: (component_view_free):
	* es-event.c: (es_event_peek):
	* es-menu.c: (es_menu_new):
	* importer/evolution-importer-client.c:
	(evolution_importer_client_create_control):
	Warning fixes:
	- NULL vs 0 vs FALSE
	- ANSIfication of declarations
	- guint for 1-bit bitfields

svn path=/trunk/; revision=34430

1 files changed, 2 insertions, 2 deletions

diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 36c2c67158..24ed38b445 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -124,8 +124,8 @@ evolution_importer_client_create_control (EvolutionImporterClient *client)
 	Bonobo_Control control;
 	CORBA_Environment ev;
 	
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), FALSE);
+	g_return_val_if_fail (client != NULL, NULL);
+	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), NULL);
 
 	CORBA_exception_init (&ev);
 	corba_importer = client->objref;