From a1fb36c15210deac4ca989703587060c549c6e51 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed, 24 Oct 2007 14:10:02 +0000
Subject: Warning fixes: - NULL vs 0 vs FALSE/TRUE - ANSIfication of
 declarations -

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

	* gui/alarm-notify/alarm-notify-dialog.c:
	* gui/alarm-notify/alarm-notify.c:
	* gui/alarm-notify/alarm-queue.c:
	* gui/alarm-notify/config-data.c:
	* gui/cal-search-bar.c:
	* gui/calendar-commands.c:
	* gui/calendar-config.c:
	* gui/dialogs/alarm-dialog.c:
	* gui/dialogs/alarm-list-dialog.c:
	* gui/dialogs/cal-prefs-dialog.c:
	* gui/dialogs/comp-editor.c:
	* gui/dialogs/event-page.c:
	* gui/dialogs/recurrence-page.c:
	* gui/e-alarm-list.c:
	* gui/e-cal-config.c:
	* gui/e-cal-event.c:
	* gui/e-cal-menu.c:
	* gui/e-cal-popup.c:
	* gui/e-calendar-table.c:
	* gui/e-calendar-view.c:
	* gui/e-date-time-list.c:
	* gui/e-day-view-main-item.c:
	* gui/e-day-view-time-item.c:
	* gui/e-day-view.c:
	* gui/e-itip-control.c:
	* gui/e-meeting-list-view.c:
	* gui/e-memo-table.c:
	* gui/e-select-names-editable.c:
	* gui/e-week-view-event-item.c:
	* gui/e-week-view.c:
	* gui/goto.c:
	* gui/migration.c:
	* gui/print.c:
	* gui/tasks-control.c:
	* importers/icalendar-importer.c:

	Warning fixes:
	- NULL vs 0 vs FALSE/TRUE
	- ANSIfication of declarations
	- mixing declarations and code
	- mark some code static
	- remove use of some deprecated Gtk+ apis

svn path=/trunk/; revision=34420
---
 calendar/gui/migration.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'calendar/gui/migration.c')

diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 27ddee0384..f6b977bbe9 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -81,7 +81,7 @@ static e_gconf_map_t calendar_display_map[] = {
 	{ "CompressWeekend", "calendar/display/compress_weekend", E_GCONF_MAP_BOOL },
 	{ "ShowEventEndTime", "calendar/display/show_event_end", E_GCONF_MAP_BOOL },
 	{ "WorkingDays", "calendar/display/working_days", E_GCONF_MAP_INT },
-	{ 0 },
+	{ NULL },
 };
 
 static e_gconf_map_t calendar_tasks_map[] = {
@@ -89,7 +89,7 @@ static e_gconf_map_t calendar_tasks_map[] = {
 	{ "HideCompletedTasks", "calendar/tasks/hide_completed", E_GCONF_MAP_BOOL },
 	{ "HideCompletedTasksUnits", "calendar/tasks/hide_completed_units", E_GCONF_MAP_STRING },
 	{ "HideCompletedTasksValue", "calendar/tasks/hide_completed_value", E_GCONF_MAP_INT },
-	{ 0 },
+	{ NULL },
 };
 
 static e_gconf_map_t calendar_tasks_colours_map[] = {
@@ -97,7 +97,7 @@ static e_gconf_map_t calendar_tasks_colours_map[] = {
 	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
 	{ "TasksOverDue", "calendar/tasks/colors/overdue", E_GCONF_MAP_STRING },
 	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ 0 },
+	{ NULL },
 };
 
 static e_gconf_map_t calendar_other_map[] = {
@@ -107,13 +107,13 @@ static e_gconf_map_t calendar_other_map[] = {
 	{ "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL },
 	{ "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT },
 	{ "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING },
-	{ 0 },
+	{ NULL },
 };
 
 static e_gconf_map_t calendar_datenavigator_map[] = {
 	/* /Calendar/DateNavigator */
 	{ "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL },
-	{ 0 },
+	{ NULL },
 };
 
 static e_gconf_map_t calendar_alarmnotify_map[] = {
@@ -121,25 +121,25 @@ static e_gconf_map_t calendar_alarmnotify_map[] = {
 	{ "LastNotificationTime", "calendar/notify/last_notification_time", E_GCONF_MAP_INT },
 	{ "CalendarToLoad%i", "calendar/notify/calendars", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
 	{ "BlessedProgram%i", "calendar/notify/programs", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ 0 },
+	{ NULL },
 };
 
-e_gconf_map_list_t calendar_remap_list[] = {
+static e_gconf_map_list_t calendar_remap_list[] = {
 
 	{ "/Calendar/Display", calendar_display_map },
 	{ "/Calendar/Other/Map", calendar_other_map },
 	{ "/Calendar/DateNavigator", calendar_datenavigator_map },
 	{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
 
-	{ 0 },
+	{ NULL },
 };
 
-e_gconf_map_list_t task_remap_list[] = {
+static e_gconf_map_list_t task_remap_list[] = {
 
 	{ "/Calendar/Tasks", calendar_tasks_map },
 	{ "/Calendar/Tasks/Colors", calendar_tasks_colours_map },
 
-	{ 0 },
+	{ NULL },
 };
 
 static GtkWidget *window;
-- 
cgit v1.2.3