Fix compiler warnings and deprecated GTK+ API usage.

43 files changed, 105 insertions, 102 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 172d45ee30..79c82cdb77 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -29,6 +29,14 @@
 
 #define G_LOG_DOMAIN "eaddrconduit"
 
+/* 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 <libxml/parser.h>
 #include <pi-source.h>
 #include <pi-socket.h>
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)
diff --git a/configure.ac b/configure.ac
index 535d982e7f..d78715cb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 	-DGDK_DISABLE_DEPRECATED
 	-DG_DISABLE_SINGLE_INCLUDES
-	-DGTK_DISABLE_SINGLE_INCLUDES
 	-Wall -Wextra
 	-Wno-missing-field-initializers
 	-Wno-sign-compare
@@ -100,6 +99,10 @@ dnl	-Wmissing-format-attribute
 dnl	-Wshadow
 dnl	-Wformat-nonliteral
 
+dnl Disabled until libunique fixes its headers.  Think it's
+dnl already fixed in git, just waiting for a formal release.
+dnl	-DGTK_DISABLE_SINGLE_INCLUDES
+
 CFLAGS="$CFLAGS $WARNING_FLAGS"
 
 AC_CANONICAL_HOST
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c9f0594c2d..f268b14596 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2340,8 +2340,6 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 	EMsgComposer *composer;
 	EAccount *account;
 	guint32 flags;
-	EMEvent *eme;
-	EMEventTargetMessage *target;
 	struct emcs_t *emcs;
 
 	if (folder && uid && message == NULL) {
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index dd4de6370b..61726dd37f 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -114,23 +114,6 @@ mail_importer_add_line (MailImporter *importer,
 	camel_message_info_free(info);
 }
 
-struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data)
-{
-#if 0
-	if (strcmp(iid, ELM_INTELLIGENT_IMPORTER_IID) == 0)
-		return elm_intelligent_importer_new();
-	else if (strcmp(iid, PINE_INTELLIGENT_IMPORTER_IID) == 0)
-		return pine_intelligent_importer_new();
-	else if (strcmp(iid, NETSCAPE_INTELLIGENT_IMPORTER_IID) == 0)
-		return netscape_intelligent_importer_new();
-	else if (strcmp(iid, MBOX_IMPORTER_IID) == 0)
-		return mbox_importer_new();
-	else if (strcmp(iid, OUTLOOK_IMPORTER_IID) == 0)
-		return outlook_importer_new();
-#endif
-	return NULL;
-}
-
 struct _import_mbox_msg {
 	MailMsg base;
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index b0dfbb3f08..d751547827 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -24,10 +24,8 @@
 #ifndef __MAIL_IMPORTER_H__
 #define __MAIL_IMPORTER_H__
 
-#include <bonobo.h>
-#include <camel/camel-folder.h>
-
 #include <e-util/e-import.h>
+#include <camel/camel-folder.h>
 
 typedef struct _MailImporter MailImporter;
 struct _MailImporter {
@@ -57,22 +55,6 @@ EImportImporter *mbox_importer_peek(void);
 EImportImporter *elm_importer_peek(void);
 EImportImporter *pine_importer_peek(void);
 
-#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:" BASE_VERSION
-#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:" BASE_VERSION
-#define NETSCAPE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer:" BASE_VERSION
-
-#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
-#define OUTLOOK_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Outlook_Importer:" BASE_VERSION
-
-BonoboObject *elm_intelligent_importer_new(void);
-BonoboObject *pine_intelligent_importer_new(void);
-BonoboObject *netscape_intelligent_importer_new(void);
-
-BonoboObject *mbox_importer_new(void);
-BonoboObject *outlook_importer_new(void);
-
-BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data);
-
 /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */
 /* Evolution only cares about these headers I think */
 #define MSG_FLAG_READ 0x0001
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 68e276d1c7..ac6a7d1860 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -30,6 +30,7 @@
 #include <libedataserverui/e-source-selector.h>
 #include <libedataserverui/e-name-selector-entry.h>
 
+#include "e-util/e-binding.h"
 #include "e-util/e-datetime-format.h"
 #include "widgets/misc/e-preferences-window.h"
 
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 0dd3ff1ece..7d819d8d8b 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -304,7 +304,6 @@ cal_shell_content_constructed (GObject *object)
 	EShellContent *foreign_content;
 	EShellView *foreign_view;
 	GnomeCalendar *calendar;
-	GnomeCalendarViewType view_type;
 	GalViewInstance *view_instance;
 	GConfBridge *bridge;
 	GtkWidget *container;
@@ -313,7 +312,6 @@ cal_shell_content_constructed (GObject *object)
 	const gchar *key;
 	gchar *filename;
 	gchar *markup;
-	gint page_num;
 	gint ii;
 
 	priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (object);
@@ -477,7 +475,6 @@ static void
 cal_shell_content_map (GtkWidget *widget)
 {
 	ECalShellContentPrivate *priv;
-	GalViewInstance *view_instance;
 
 	/* XXX Delay loading the GalViewInstance until after ECalShellView
 	 *     has a chance to install the sidebar's date navigator into
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index bc17a90e9b..f59b62597c 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -134,19 +134,19 @@ setup_progress_dialog (void)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	gtk_widget_show (window);
 }
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index c6d3c984fb..4e6939c892 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -24,6 +24,8 @@
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal-util.h>
 
+#include "e-util/e-binding.h"
+
 static gboolean
 transform_string_to_icaltimezone (const GValue *src_value,
                                   GValue *dst_value,
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 699cf2460c..b36c94b8d1 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -264,7 +264,10 @@ action_calendar_properties_cb (GtkAction *action,
 	source = e_source_selector_peek_primary_selection (selector);
 	g_return_if_fail (E_IS_SOURCE (source));
 
-	calendar_setup_edit_calendar (GTK_WINDOW (shell_window), source);
+	/* XXX Does this -really- need a source group parameter? */
+	calendar_setup_edit_calendar (
+		GTK_WINDOW (shell_window), source,
+		e_source_peek_group (source));
 }
 
 static void
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 719e705382..a81b7cd866 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -390,7 +390,6 @@ void
 e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 {
 	ECalShellViewPrivate *priv = cal_shell_view->priv;
-	GList *iter;
 
 	DISPOSE (priv->cal_shell_backend);
 	DISPOSE (priv->cal_shell_content);
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 77f9e1b06b..f982e06a0f 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -29,9 +29,12 @@
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-sexp.h>
 
-#include "e-util/e-util.h"
+#include "e-util/e-binding.h"
 #include "e-util/e-dialog-utils.h"
+#include "e-util/e-error.h"
+#include "e-util/e-util.h"
 #include "widgets/misc/e-popup-action.h"
 
 #include "calendar/common/authentication.h"
@@ -41,8 +44,9 @@
 #include "calendar/gui/e-cal-model-tasks.h"
 #include "calendar/gui/e-calendar-view.h"
 #include "calendar/gui/gnome-cal.h"
-/*#include "calendar/gui/goto.h"*/
+#include "calendar/gui/goto.h"
 #include "calendar/gui/print.h"
+#include "calendar/gui/dialogs/calendar-setup.h"
 #include "calendar/gui/dialogs/copy-source-dialog.h"
 #include "calendar/gui/dialogs/event-editor.h"
 #include "calendar/gui/dialogs/memo-editor.h"
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index 4bbaee65a6..ebc03e971d 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -101,19 +101,19 @@ setup_progress_dialog (void)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	gtk_widget_show (window);
 }
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 38c5ab6033..a0ca5ee978 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -224,7 +224,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	ECalModel *model;
 	ETable *table;
 	ESourceSelector *selector;
-	guint id;
 
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
@@ -363,7 +362,6 @@ void
 e_task_shell_view_private_dispose (ETaskShellView *task_shell_view)
 {
 	ETaskShellViewPrivate *priv = task_shell_view->priv;
-	GList *iter;
 
 	DISPOSE (priv->task_shell_backend);
 	DISPOSE (priv->task_shell_content);
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index 50fa306696..e612069bed 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -30,6 +30,7 @@
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-sexp.h>
 
+#include "e-util/e-binding.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 1c24d56eab..3da217d2ea 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -29,6 +29,7 @@
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-binding.h"
+#include "e-util/e-error.h"
 #include "e-util/e-import.h"
 #include "e-util/e-util.h"
 #include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index d2614befdb..7176d4fba7 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -1114,19 +1114,19 @@ em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc)
 
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
+	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
+	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
 	label = (GtkLabel *) gtk_label_new ("");
 	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
 
 	progress = (GtkProgressBar *) gtk_progress_bar_new ();
 	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
+	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
 
 	/* Prepare the message */
 	vbox = gtk_vbox_new (FALSE, 12);
diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h
index 8f977dc9b9..6faa18b7d9 100644
--- a/modules/mail/em-composer-prefs.h
+++ b/modules/mail/em-composer-prefs.h
@@ -62,9 +62,6 @@ struct _EMComposerPrefs {
 
 	/* General tab */
 
-	/* Default Behavior */
-	GtkOptionMenu *charset;
-
 	GtkTreeModel *language_model;
 
 	/* Forwards and Replies */
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index e35c2085ab..01f823b11e 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -69,7 +69,6 @@ struct _EMMailerPrefs {
 
 	/* Message Display */
 	GtkSpinButton *timeout;
-	GtkOptionMenu *charset;
 
 	/* HTML Mail tab */
 	GtkFontButton *font_variable;
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 8aa41e5fe7..560fa5c63c 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -130,7 +130,7 @@ epbr_perform_pre_backup_checks (gchar * dir)
 #endif
 }
 
-void
+static void
 action_settings_backup_cb (GtkAction *action,
                            EShellWindow *shell_window)
 {
@@ -184,7 +184,7 @@ action_settings_backup_cb (GtkAction *action,
 	gtk_widget_destroy (dlg);
 }
 
-void
+static void
 action_settings_restore_cb (GtkAction *action,
                             EShellWindow *shell_window)
 {
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 5dd164a47f..976eaa408d 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -255,10 +255,11 @@ get_suggested_foldername (EImportTargetURI *target)
 	}
 
 	if (mail_tool_uri_to_folder (foldername->str, 0, NULL) != NULL) {
+		CamelFolder *folder;
+
 		/* Folder exists - add a number */
 		gint i, len;
 		len = foldername->len;
-		CamelFolder *folder;
 
 		for (i=1; i<10000; i++) {
 			g_string_truncate (foldername, len);
@@ -350,7 +351,7 @@ pst_import_describe (PstImporter *m, gint complete)
 }
 
 static ECal*
-open_ecal (ECalSourceType type, gchar *name)
+open_ecal (ECalSourceType type, const gchar *name)
 {
 	/* Hack - grab the first calendar we can find
 		TODO - add a selection mechanism in get_widget */
@@ -730,7 +731,7 @@ static CamelMimePart *
 attachment_to_part (PstImporter *m, pst_item_attach *attach)
 {
 	CamelMimePart *part;
-	gchar *mimetype;
+	const gchar *mimetype;
 
 	part = camel_mime_part_new ();
 
@@ -831,7 +832,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		if (item->email->sentto_address.str != NULL) {
 			addr = camel_internet_address_new ();
 
-			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0);
+			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "To", addr);
 
 			camel_object_unref (addr);
@@ -840,7 +841,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		if (item->email->cc_address.str != NULL) {
 			addr = camel_internet_address_new ();
 
-			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0);
+			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "CC", addr);
 
 			camel_object_unref (addr);
@@ -941,7 +942,7 @@ contact_set_string (EContact *contact, EContactField id, gchar *string)
 }
 
 static void
-unknown_field (EContact *contact, GString *notes, gchar *name, gchar *string)
+unknown_field (EContact *contact, GString *notes, const gchar *name, gchar *string)
 {
 	/* Field could not be mapped directly so add to notes field */
 	if (string != NULL) {
@@ -1010,9 +1011,9 @@ pst_process_contact (PstImporter *m, pst_item *item)
 {
 	pst_item_contact *c;
 	EContact *ec;
-	c = item->contact;
 	GString *notes;
 
+	c = item->contact;
 	notes = g_string_sized_new (2048);
 
 	ec = e_contact_new ();
@@ -1274,12 +1275,13 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gcha
 	pst_item_appointment *a;
 	pst_item_email *e;
 
-	a = item->appointment;
-	e = item->email;
 	ECalComponentText text;
 	struct icaltimetype tt_start, tt_end;
 	ECalComponentDateTime dt_start, dt_end;
 
+	a = item->appointment;
+	e = item->email;
+
 	if (item->create_date) {
 		struct icaltimetype tt;
 		tt = get_ical_date (item->create_date, FALSE);
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 3fcb91c2e3..81f6bd7025 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -38,6 +38,7 @@
 #include <mail/e-mail-local.h>
 #include <mail/e-mail-reader.h>
 #include <mail/em-composer-utils.h>
+#include <mail/em-utils.h>
 #include <mail/mail-session.h>
 #include <mail/mail-ops.h>
 #include <mail/message-list.h>
@@ -773,6 +774,8 @@ init_shell_actions (GtkUIManager *ui_manager,
 	g_signal_connect (
 		shell_view, "update-actions",
 		G_CALLBACK (update_actions_cb), NULL);
+
+	return TRUE;
 }
 
 gboolean
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index b0bfe7c63a..5314a3679f 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -29,6 +29,7 @@
 
 #include <e-util/e-util.h>
 #include <e-util/e-binding.h>
+#include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
 #include <widgets/misc/e-menu-tool-button.h>
 #include <widgets/misc/e-online-button.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index e8a95b1523..8e05980623 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -310,7 +310,7 @@ shell_ready_for_quit (EShell *shell,
 	g_list_free (list);
 }
 
-void
+static void
 shell_prepare_for_quit (EShell *shell)
 {
 	GList *list, *iter;
@@ -344,7 +344,7 @@ shell_prepare_for_quit (EShell *shell)
 		gtk_widget_set_sensitive (GTK_WIDGET (iter->data), FALSE);
 }
 
-gboolean
+static gboolean
 shell_request_quit (EShell *shell)
 {
 	/* Are preparations already in progress? */
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index d64dcafb4a..1cd517d3e2 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -199,7 +199,7 @@ exit:
 static void
 attachment_button_update_pixbufs (EAttachmentButton *button)
 {
-	GtkCellView *cell_view;
+	GtkCellLayout *cell_layout;
 	GtkCellRenderer *renderer;
 	GtkIconTheme *icon_theme;
 	GdkPixbuf *pixbuf_expander_open;
@@ -209,8 +209,8 @@ attachment_button_update_pixbufs (EAttachmentButton *button)
 	icon_theme = gtk_icon_theme_get_default ();
 
 	/* Grab the first cell renderer. */
-	cell_view = GTK_CELL_VIEW (button->priv->cell_view);
-	list = gtk_cell_view_get_cell_renderers (cell_view);
+	cell_layout = GTK_CELL_LAYOUT (button->priv->cell_view);
+	list = gtk_cell_layout_get_cells (cell_layout);
 	renderer = GTK_CELL_RENDERER (list->data);
 	g_list_free (list);
 
diff --git a/widgets/misc/e-menu-tool-button.c b/widgets/misc/e-menu-tool-button.c
index 53778e6678..58c8317053 100644
--- a/widgets/misc/e-menu-tool-button.c
+++ b/widgets/misc/e-menu-tool-button.c
@@ -84,7 +84,8 @@ menu_tool_button_update_button (GtkToolButton *tool_button)
 
 	/* If the menu item is a proxy for a GtkAction, extract
 	 * the action's tooltip and use it as our own tooltip. */
-	action = gtk_widget_get_action (GTK_WIDGET (menu_item));
+	action = gtk_activatable_get_related_action (
+		GTK_ACTIVATABLE (menu_item));
 	if (action != NULL)
 		g_object_get (action, "tooltip", &tooltip, NULL);
 	gtk_widget_set_tooltip_text (GTK_WIDGET (tool_button), tooltip);