Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE -

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

	* gui/contact-editor/e-contact-editor-address.c:
	* gui/contact-editor/e-contact-editor-fullname.c:
	* gui/contact-editor/e-contact-editor-im.c:
	* gui/contact-editor/e-contact-editor.c: (save_contact),
	(app_delete_event_cb), (e_contact_editor_set_property),
	(e_contact_editor_create_date):
	* gui/contact-list-editor/e-contact-list-model.c:
	(e_contact_list_model_new):
	* gui/merging/eab-contact-merging.c: (mergeit), (response):
	* gui/widgets/e-minicard.c: (e_minicard_event), (add_field),
	(get_email_location), (add_email_field), (remodel),
	(e_minicard_reflow), (e_minicard_compare):
	* gui/widgets/eab-config.c: (eab_config_new):
	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog),
	(file_exists), (save_it), (contact_added_cb),
	(eab_send_to_contact_and_email_num_list):
	* gui/widgets/eab-menu.c: (eab_menu_new):
	* gui/widgets/eab-popup.c: (eab_popup_new):
	* importers/evolution-csv-importer.c: (parseLine),
	(getNextCSVEntry):
	* printing/e-contact-print-style-editor.c:
	* printing/test-contact-print-style-editor.c:
	* printing/test-print.c:
	* util/eab-book-util.c: (eab_get_config_database):

	Warning fixes:
	- mixing code and declarations
	- NULL vs 0 vs FALSE/TRUE
	- mark code static
	- some coding style fixes
	- if vs ifdef
	- Remove some unused bits
	- ANSIfication of declarations

svn path=/trunk/; revision=34421

1 files changed, 6 insertions, 6 deletions

diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 59a64cd549..d37c1b7b73 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -116,7 +116,7 @@ eab_popup_get_type(void)
 
 EABPopup *eab_popup_new(const char *menuid)
 {
-	EABPopup *eabp = g_object_new(eab_popup_get_type(), 0);
+	EABPopup *eabp = g_object_new(eab_popup_get_type(), NULL);
 
 	e_popup_construct(&eabp->popup, menuid);
 
@@ -298,24 +298,24 @@ static const EPopupHookTargetMask eabph_select_masks[] = {
 	{ "any", EAB_POPUP_SELECT_ANY },
 	{ "editable", EAB_POPUP_SELECT_EDITABLE },
 	{ "email", EAB_POPUP_SELECT_EMAIL },
-	{ 0 }
+	{ NULL }
 };
 
 static const EPopupHookTargetMask eabph_source_masks[] = {
 	{ "primary", EAB_POPUP_SOURCE_PRIMARY },
 	{ "system", EAB_POPUP_SOURCE_SYSTEM },
-	{ 0 }
+	{ NULL }
 };
 
 static const EPopupHookTargetMask eabph_uri_masks[] = {
 	{ "http", EAB_POPUP_URI_HTTP },
 	{ "internal-mailto", EAB_POPUP_URI_MAILTO },
 	{ "notmailto", EAB_POPUP_URI_NOT_MAILTO },
-	{ 0 }
+	{ NULL }
 };
 
 static const EPopupHookTargetMask eabph_select_names_masks[] = {
-	{ 0 }
+	{ NULL }
 };
 
 static const EPopupHookTargetMap eabph_targets[] = {
@@ -323,7 +323,7 @@ static const EPopupHookTargetMap eabph_targets[] = {
         { "uri", EAB_POPUP_TARGET_URI, eabph_uri_masks },
 	{ "source", EAB_POPUP_TARGET_SOURCE, eabph_source_masks },
 	{ "select-names", EAB_POPUP_TARGET_SELECT_NAMES, eabph_select_names_masks },
-	{ 0 }
+	{ NULL }
 };
 
 static void