Warning fixes. - NULL vs 0 - ANSIfication of declarations - missing

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

	* e-config.c:
	* e-event.c:
	* e-gui-utils.c:
	* e-import.c:
	* e-menu.c:
	* e-mktemp.c: (get_dir):
	* e-popup.c:
	* e-profile-event.c: (e_profile_event_peek):
	* e-util.c: (get_font_options):
	* e-xml-utils.c: (e_xml_get_string_prop_by_name),
	(e_xml_get_string_prop_by_name_with_default),
	(e_xml_get_translated_string_prop_by_name):

	Warning fixes.
	- NULL vs 0
	- ANSIfication of declarations
	- missing include

svn path=/trunk/; revision=34428

11 files changed, 39 insertions, 18 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 02e1bb5968..ccb45fed49 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,23 @@
+2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-config.c:
+	* e-event.c:
+	* e-gui-utils.c:
+	* e-import.c:
+	* e-menu.c:
+	* e-mktemp.c: (get_dir):
+	* e-popup.c:
+	* e-profile-event.c: (e_profile_event_peek):
+	* e-util.c: (get_font_options):
+	* e-xml-utils.c: (e_xml_get_string_prop_by_name),
+	(e_xml_get_string_prop_by_name_with_default),
+	(e_xml_get_translated_string_prop_by_name):
+
+	Warning fixes.
+	- NULL vs 0
+	- ANSIfication of declarations
+	- missing include
+
 2007-10-12  Michael Monreal <michael.monreal@gmail.com>
 
 	** Migration of theme icons to data/icons/ (bug #479257)
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 49e745b89b..484630cd1d 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -1265,7 +1265,7 @@ static const EPluginHookTargetKey ech_item_types[] = {
 	{ "section_table", E_CONFIG_SECTION_TABLE },
 	{ "item", E_CONFIG_ITEM },
 	{ "item_table", E_CONFIG_ITEM_TABLE },
-	{ 0 },
+	{ NULL },
 };
 
 static void
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 293347e7b6..363cc7f91f 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -398,7 +398,7 @@ static void *emph_parent_class;
 static const EPluginHookTargetKey emph_item_types[] = {
 	{ "pass", E_EVENT_PASS },
 	{ "sink", E_EVENT_SINK },
-	{ 0 }
+	{ NULL }
 };
 
 static void
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index b206b24d01..18f9c9b50f 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -26,6 +26,7 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkhbox.h>
+#include <gtk/gtkicontheme.h>
 
 #include <libgnome/gnome-program.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 2ca5ad5f1e..7cf02c07e5 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -431,13 +431,13 @@ static void *emph_parent_class;
 #define emph ((EImportHook *)eph)
 
 static const EImportHookTargetMask eih_no_masks[] = {
-	{ 0 }
+	{ NULL }
 };
 
 static const EImportHookTargetMap eih_targets[] = {
 	{ "uri", E_IMPORT_TARGET_URI, eih_no_masks },
 	{ "home", E_IMPORT_TARGET_HOME, eih_no_masks },
-	{ 0 }
+	{ NULL }
 };
 
 static gboolean eih_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index 4ef45dbe03..c9e6d098b4 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -609,7 +609,7 @@ static const EPluginHookTargetKey emph_item_types[] = {
 	{ "item", E_MENU_ITEM },
 	{ "toggle", E_MENU_TOGGLE },
 	{ "radio", E_MENU_RADIO },
-	{ 0 }
+	{ NULL }
 };
 
 /* 1:1 with e-icon-factory sizes */
@@ -620,7 +620,7 @@ static const EPluginHookTargetKey emph_pixmap_sizes[] = {
 	{ "large_toolbar", 3},
 	{ "dnd", 4},
 	{ "dialog", 5},
-	{ 0 }
+	{ NULL }
 };
 
 static void
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index f9841e0629..02a3e784fd 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -105,7 +105,7 @@ static GString *
 get_dir (gboolean make)
 {
 	GString *path;
-	time_t now = time(0);
+	time_t now = time(NULL);
 	static time_t last = 0;
 	
 #ifdef TEMP_HOME
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 5492ca1067..ce723a2368 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -714,7 +714,7 @@ static const EPluginHookTargetKey emph_item_types[] = {
 	{ "image", E_POPUP_IMAGE },
 	{ "submenu", E_POPUP_SUBMENU },
 	{ "bar", E_POPUP_BAR },
-	{ 0 }
+	{ NULL }
 };
 
 static void
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 9e647c1585..9c86f72b60 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -101,7 +101,7 @@ e_profile_event_get_type(void)
 EProfileEvent *e_profile_event_peek(void)
 {
 	if (e_profile_event == NULL) {
-		e_profile_event = g_object_new(e_profile_event_get_type(), 0);
+		e_profile_event = g_object_new(e_profile_event_get_type(), NULL);
 		e_event_construct(&e_profile_event->popup, "org.gnome.evolution.profile.events");
 	}
 
@@ -151,12 +151,12 @@ static const EEventHookTargetMask emeh_profile_masks[] = {
 	{ "start", E_PROFILE_EVENT_START },
 	{ "end", E_PROFILE_EVENT_END },
 	{ "cancel", E_PROFILE_EVENT_CANCEL },
-	{ 0 }
+	{ NULL }
 };
 
 static const EEventHookTargetMap emeh_targets[] = {
 	{ "event", E_PROFILE_EVENT_TARGET, emeh_profile_masks },
-	{ 0 }
+	{ NULL }
 };
 
 static void
diff --git a/e-util/e-util.c b/e-util/e-util.c
index bbeb215ba9..05bfdb4c0f 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -810,7 +810,7 @@ e_strdup_append_strings (gchar *first_string, ...)
 }
 
 cairo_font_options_t *
-get_font_options ()
+get_font_options (void)
 {
 	gchar *antialiasing, *hinting, *subpixel_order;
 	GConfClient *gconf = gconf_client_get_default ();
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index f55006eadf..1a737626a8 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -373,8 +373,8 @@ e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gdouble
 gchar *
 e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
 {
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
+	g_return_val_if_fail (parent != NULL, NULL);
+	g_return_val_if_fail (prop_name != NULL, NULL);
 
 	return e_xml_get_string_prop_by_name_with_default (parent, prop_name, NULL);
 }
@@ -385,8 +385,8 @@ e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, const xmlChar
 	xmlChar *prop;
 	gchar *ret_val;
 
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
+	g_return_val_if_fail (parent != NULL, NULL);
+	g_return_val_if_fail (prop_name != NULL, NULL);
 
 	prop = xmlGetProp ((xmlNode *) parent, prop_name);
 	if (prop != NULL) {
@@ -416,8 +416,8 @@ e_xml_get_translated_string_prop_by_name (const xmlNode *parent, const xmlChar *
 	gchar *ret_val = NULL;
 	gchar *combined_name;
 
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
+	g_return_val_if_fail (parent != NULL, NULL);
+	g_return_val_if_fail (prop_name != NULL, NULL);
 
 	prop = xmlGetProp ((xmlNode *) parent, prop_name);
 	if (prop != NULL) {