Fix compiler warnings and deprecated GTK+ API usage.

17 files changed, 41 insertions, 21 deletions

diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 0052c13f30..cd91981799 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -27,6 +27,13 @@
 
 #define G_LOG_DOMAIN "ecalconduit"
 
+/* Work around deprecated API usage in GnomePilot. */
+#ifdef GTK_DISABLE_DEPRECATED
+#include <glib-object.h>
+#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
+typedef GType GtkType;
+#endif
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index ac28e0465c..a7bc8952a1 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -29,6 +29,13 @@
 
 #define G_LOG_DOMAIN "ememoconduit"
 
+/* Work around deprecated API usage in GnomePilot. */
+#ifdef GTK_DISABLE_DEPRECATED
+#include <glib-object.h>
+#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
+typedef GType GtkType;
+#endif
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 89e012bfd7..6868b4681a 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -29,6 +29,13 @@
 
 #define G_LOG_DOMAIN "etodoconduit"
 
+/* Work around deprecated API usage in GnomePilot. */
+#ifdef GTK_DISABLE_DEPRECATED
+#include <glib-object.h>
+#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
+typedef GType GtkType;
+#endif
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 1ed8409bd4..6fccf0cea1 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -505,9 +505,8 @@ show_alarms_config (CalendarPrefsDialog *prefs)
 static void
 show_config (CalendarPrefsDialog *prefs)
 {
-	gint mask, day, time_divisions;
-	icaltimezone *zone;
-	gboolean sensitive, set = FALSE;
+	gint time_divisions;
+	gboolean set = FALSE;
 	CalUnits units;
 	gint interval;
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index c4908158d6..91c879928c 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -34,6 +34,7 @@
 #include <glib/gi18n.h>
 
 #include <misc/e-dateedit.h>
+#include <e-util/e-binding.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
 
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 979e182a8c..5a7277084b 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -32,6 +32,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
+#include <e-util/e-binding.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 37cf357fe9..edd54859d6 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -33,8 +33,9 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
-#include <e-util/e-plugin-ui.h>
-#include <e-util/e-util-private.h>
+#include "e-util/e-binding.h"
+#include "e-util/e-plugin-ui.h"
+#include "e-util/e-util-private.h"
 
 #include "task-page.h"
 #include "task-details-page.h"
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 10e59d08af..74647e46dc 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -31,6 +31,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
+
+#include "e-util/e-binding.h"
 #include "calendar-config.h"
 #include "e-cal-model-tasks.h"
 #include "e-cell-date-edit-text.h"
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 04a81a8697..377b7a6761 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -412,8 +412,6 @@ e_cal_model_class_init (ECalModelClass *class)
 static void
 e_cal_model_init (ECalModel *model)
 {
-	ECalModelPrivate *priv;
-
 	model->priv = E_CAL_MODEL_GET_PRIVATE (model);
 
 	/* match none by default */
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index 54858e56f9..94bd5ae339 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -36,8 +36,8 @@ enum {
 };
 
 static GtkTargetEntry drag_types[] = {
-	{ "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
+	{ (gchar *) "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
+	{ (gchar *) "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
 };
 
 static gpointer parent_class;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 13cbeeebcf..1122310a49 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -42,6 +42,7 @@
 #include <table/e-cell-text.h>
 #include <table/e-cell-combo.h>
 #include <table/e-cell-date.h>
+#include <e-util/e-binding.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
 #include <table/e-cell-date-edit.h>
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index f2d20b3729..a56dbc02fc 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -580,7 +580,7 @@ e_calendar_view_get_visible_time_range (ECalendarView *cal_view,
 	class = E_CALENDAR_VIEW_GET_CLASS (cal_view);
 	g_return_val_if_fail (class->get_visible_time_range != NULL, FALSE);
 
-	class->get_visible_time_range (cal_view, start_time, end_time);
+	return class->get_visible_time_range (cal_view, start_time, end_time);
 }
 
 void
@@ -1970,15 +1970,6 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
 	cairo_close_path (cr);
 }
 
-static void
-error_response(GtkWidget *widget, gint response, gpointer data)
-{
-	if (response == GTK_RESPONSE_DELETE_EVENT)
-		gtk_widget_destroy(widget);
-	else if (response == GTK_RESPONSE_OK)
-		gtk_widget_destroy(widget);
-}
-
 /* returns either light or dark yellow, based on the base_background,
    which is the default background color */
 GdkColor
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 540443a255..1c61353c7b 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -297,7 +297,7 @@ gboolean	e_meeting_time_selector_get_use_24_hour_format
 void		e_meeting_time_selector_set_use_24_hour_format
 						(EMeetingTimeSelector *mts,
 						 gboolean use_24_hour_format);
-gint		e_meeting_time_seletor_get_week_start_day
+gint		e_meeting_time_selector_get_week_start_day
 						(EMeetingTimeSelector *mts);
 void		e_meeting_time_selector_set_week_start_day
 						(EMeetingTimeSelector *mts,
diff --git a/calendar/gui/e-month-view.c b/calendar/gui/e-month-view.c
index 33e6058f9c..238492c92c 100644
--- a/calendar/gui/e-month-view.c
+++ b/calendar/gui/e-month-view.c
@@ -21,6 +21,8 @@
 
 #include "e-month-view.h"
 
+#include <libecal/e-cal-time-util.h>
+
 #define E_MONTH_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MONTH_VIEW, EMonthViewPrivate))
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index e027ef2429..58f14b9acf 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -39,6 +39,7 @@
 #include <text/e-text.h>
 #include <misc/e-canvas-utils.h>
 #include <misc/e-gui-utils.h>
+#include <e-util/e-binding.h>
 #include <e-util/e-unicode.h>
 #include <e-util/e-categories-config.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 410833a9ed..bca4710260 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -352,6 +352,7 @@ action_interface_do_action (AtkAction *action, gint index)
 		 e_calendar_view_new_appointment_for (cal_view,
 						 dtstart, dtend, FALSE, TRUE);
 		 break;
+#if 0  /* FIXME Have to go through GnomeCalendar */
 	 case 3:
 		 /* Go to today */
 		 break;
@@ -360,6 +361,7 @@ action_interface_do_action (AtkAction *action, gint index)
 		 /* Go to date */
 		 goto_dialog (e_calendar_view_get_calendar (cal_view));
 		 break;
+#endif
 	 default:
 		 return_value = FALSE;
 		 break;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 1a7fe610ab..5ada5f239c 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -65,7 +65,7 @@
 #include "calendar-view-factory.h"
 #include "tag-calendar.h"
 #include "misc.h"
-/*#include "a11y/ea-calendar.h"  KILL-BONOBO */
+#include "ea-calendar.h"
 #include "common/authentication.h"
 
 #define d(x)