Drop backward-compatibility cruft.

115 files changed, 41 insertions, 587 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index c26b6e5e96..ce9092c411 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -28,9 +28,6 @@
 
 #include "e-contact-editor-fullname.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void fill_in_info (EContactEditorFullname *editor);
 static void extract_info (EContactEditorFullname *editor);
 
@@ -200,9 +197,6 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 	content_area = gtk_dialog_get_content_area (dialog);
 
 	gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname));
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 4ca2dd624b..44a272f3a3 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -53,9 +53,6 @@
 
 #include "e-contact-editor-fullname.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define EMAIL_SLOTS   4
 #define PHONE_SLOTS   8
 #define IM_SLOTS      4
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 7c5d9a9c98..67c9c88c6f 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -47,9 +47,6 @@
 #include "e-contact-list-model.h"
 #include "eab-contact-merging.h"
 
-/* backward-compatibility cruft */
-#include <e-util/gtk-compat.h>
-
 #define E_CONTACT_LIST_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate))
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index b97fb8e1f3..dd99a12dce 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -34,9 +34,6 @@
 #include "e-util/e-util-private.h"
 #include <glib/gi18n.h>
 
-/* backend-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 typedef struct dropdown_data dropdown_data;
 typedef enum {
 	E_CONTACT_MERGING_ADD,
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 21cb6154a0..fd4e692c69 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -33,9 +33,6 @@
 #include <misc/e-canvas-utils.h>
 #include <gdk/gdkkeysyms.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_minicard_label_init		(EMinicardLabel		 *card);
 static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
 static void e_minicard_label_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index d3a05e53a6..0e36bd6b9b 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -36,9 +36,6 @@
 #include "e-util/e-util.h"
 #include "ea-addressbook.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_minicard_view_drag_data_get (GtkWidget *widget,
 					  GdkDragContext *context,
 					  GtkSelectionData *selection_data,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 27d8c8843d..07eacac291 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -39,9 +39,6 @@
 #include <libebook/e-destination.h>
 #include "ea-addressbook.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *class);
 static void e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 08b6ac7e8e..b62e5f2aa8 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -60,9 +60,6 @@
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-ui-manager.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define COMP_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_COMP_EDITOR, CompEditorPrivate))
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 06ba14751b..1798d09f90 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -58,9 +58,6 @@
 #include "event-page.h"
 #include "e-send-options-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define EVENT_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_EVENT_PAGE, EventPagePrivate))
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index dc0e9aeb1b..60d6098a7e 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -54,9 +54,6 @@
 #include "e-send-options-utils.h"
 #include "memo-page.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define MEMO_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_MEMO_PAGE, MemoPagePrivate))
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index dd8cda94fa..a0be04810b 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -46,9 +46,6 @@
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-util-private.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define RECURRENCE_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_RECURRENCE_PAGE, RecurrencePagePrivate))
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 9b2df7d546..8fe16d007d 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -54,9 +54,6 @@
 #include "../e-meeting-store.h"
 #include "../e-meeting-list-view.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define TASK_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_TASK_PAGE, TaskPagePrivate))
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 868b411a10..132f9cc29d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -61,9 +61,6 @@
 #include "goto.h"
 #include "misc.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_CALENDAR_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_CALENDAR_VIEW, ECalendarViewPrivate))
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 98c15152d0..061224b04f 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -40,9 +40,6 @@
 #include "e-calendar-view.h"
 #include "comp-util.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_DAY_VIEW_MAIN_ITEM_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_DAY_VIEW_MAIN_ITEM, EDayViewMainItemPrivate))
@@ -59,7 +56,7 @@ enum {
 static gpointer parent_class;
 
 static gboolean
-can_draw_in_region (GdkRegion *draw_region, gint x, gint y, gint width, gint height)
+can_draw_in_region (cairo_region_t *draw_region, gint x, gint y, gint width, gint height)
 {
 	GdkRectangle rect;
 
@@ -70,7 +67,8 @@ can_draw_in_region (GdkRegion *draw_region, gint x, gint y, gint width, gint hei
 	rect.width = width;
 	rect.height = height;
 
-	return gdk_region_rect_in (draw_region, &rect) != GDK_OVERLAP_RECTANGLE_OUT;
+	return cairo_region_contains_rectangle (draw_region, &rect) !=
+		CAIRO_REGION_OVERLAP_OUT;
 }
 
 static gboolean
@@ -95,7 +93,7 @@ day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *main_item,
                                               gint y,
                                               gint width,
                                               gint height,
-                                              GdkRegion *draw_region)
+                                              cairo_region_t *draw_region)
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
@@ -190,7 +188,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
                                    gint height,
                                    gint day,
                                    gint event_num,
-                                   GdkRegion *draw_region)
+                                   cairo_region_t *draw_region)
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
@@ -838,7 +836,7 @@ day_view_main_item_draw_day_events (EDayViewMainItem *main_item,
                                     gint width,
                                     gint height,
                                     gint day,
-                                    GdkRegion *draw_region)
+                                    cairo_region_t *draw_region)
 {
 	EDayView *day_view;
 	gint event_num;
@@ -861,7 +859,7 @@ day_view_main_item_draw_events_in_vbars (EDayViewMainItem *main_item,
                                          gint width,
                                          gint height,
                                          gint day,
-                                         GdkRegion *draw_region)
+                                         cairo_region_t *draw_region)
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
@@ -1026,7 +1024,7 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
 	gint weekday;
 	cairo_t *cr;
 	gboolean today = FALSE;
-	GdkRegion *draw_region;
+	cairo_region_t *draw_region;
 	GdkRectangle rect;
 
 	cr = gdk_cairo_create (drawable);
@@ -1048,7 +1046,10 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
 	rect.y = 0;
 	rect.width = width;
 	rect.height = height;
-	draw_region = gdk_region_rectangle (&rect);
+	if (rect.width > 0 && rect.height > 0)
+		draw_region = cairo_region_create_rectangle (&rect);
+	else
+		draw_region = cairo_region_create ();
 
 	/* Paint the background colors. */
 	work_day_start_y = e_day_view_convert_time_to_position (
@@ -1252,8 +1253,7 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
 		}
 		cairo_restore (cr);
 	}
-	cairo_destroy (cr);
-	gdk_region_destroy (draw_region);
+	cairo_region_destroy (draw_region);
 }
 
 static GnomeCanvasItem *
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index e762bda568..d5eaeca0ab 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -60,9 +60,6 @@
 #include "misc.h"
 #include <e-util/e-icon-factory.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 /* The minimum amount of space wanted on each side of the date string. */
 #define E_DAY_VIEW_DATE_X_PAD	4
 
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 14f05c5bc7..61ef52f47f 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -46,9 +46,6 @@
 #include "e-meeting-list-view.h"
 #include "e-meeting-time-sel-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MEETING_TIME_SELECTOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate))
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 902840a217..68884cc596 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -39,9 +39,6 @@
 
 #include <text/e-text.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_WEEK_VIEW_EVENT_ITEM_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_WEEK_VIEW_EVENT_ITEM, EWeekViewEventItemPrivate))
@@ -63,7 +60,7 @@ enum {
 static gpointer parent_class;
 
 static gboolean
-can_draw_in_region (GdkRegion *draw_region,
+can_draw_in_region (cairo_region_t *draw_region,
                     gint x,
                     gint y,
                     gint width,
@@ -78,8 +75,8 @@ can_draw_in_region (GdkRegion *draw_region,
 	rect.width = width;
 	rect.height = height;
 
-	return gdk_region_rect_in (draw_region, &rect) !=
-		GDK_OVERLAP_RECTANGLE_OUT;
+	return cairo_region_contains_rectangle (draw_region, &rect) !=
+		CAIRO_REGION_OVERLAP_OUT;
 }
 
 static ECalendarViewPosition
@@ -395,7 +392,7 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
                                  gint icon_y,
                                  gint x2,
                                  gboolean right_align,
-                                 GdkRegion *draw_region)
+                                 cairo_region_t *draw_region)
 {
 	EWeekView *week_view;
 	EWeekViewEvent *event;
@@ -519,7 +516,7 @@ week_view_event_item_draw_triangle (EWeekViewEventItem *event_item,
                                     gint y,
                                     gint w,
                                     gint h,
-                                    GdkRegion *draw_region)
+                                    cairo_region_t *draw_region)
 {
 	ECalModel *model;
 	EWeekView *week_view;
@@ -731,7 +728,7 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 	guint16 red, green, blue;
 	gdouble radius, cx0, cy0, rect_height, rect_width;
 	gdouble cc = 65535.0;
-	GdkRegion *draw_region;
+	cairo_region_t *draw_region;
 	GdkRectangle rect;
 	const gchar *color_spec;
 
@@ -780,10 +777,13 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 	rect.y = 0;
 	rect.width = width;
 	rect.height = height;
-	draw_region = gdk_region_rectangle (&rect);
+	if (rect.width > 0 && rect.height > 0)
+		draw_region = cairo_region_create_rectangle (&rect);
+	else
+		draw_region = cairo_region_create ();
 
 	if (!can_draw_in_region (draw_region, x1, y1, x2 - x1, y2 - y1)) {
-		gdk_region_destroy (draw_region);
+		cairo_region_destroy (draw_region);
 		return;
 	}
 
@@ -1104,7 +1104,7 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 	}
 	cairo_destroy (cr);
 
-	gdk_region_destroy (draw_region);
+	cairo_region_destroy (draw_region);
 }
 
 static GnomeCanvasItem *
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c57cca938c..8e1b974649 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -64,9 +64,6 @@
 /* Images */
 #include "art/jump.xpm"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_WEEK_VIEW_SMALL_FONT_PTSIZE 7
 
 #define E_WEEK_VIEW_JUMP_BUTTON_WIDTH	16
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 0d942f4a94..1be3b3dd77 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -28,9 +28,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-/* backward-compatibility cruft */
-#include <e-util/gtk-compat.h>
-
 static void ea_cal_view_class_init (EaCalViewClass *klass);
 
 static AtkObject* ea_cal_view_get_parent (AtkObject *accessible);
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 2a972847c1..ea20475c10 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -28,9 +28,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-/* backward-compatibility cruft */
-#include <e-util/gtk-compat.h>
-
 static void ea_day_view_class_init (EaDayViewClass *klass);
 
 static G_CONST_RETURN gchar * ea_day_view_get_name (AtkObject *accessible);
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index 88c288c84d..e8f7eaecb2 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -29,9 +29,6 @@
 #include <libedataserver/e-data-server-util.h>
 #include <glib/gi18n.h>
 
-/* backward-compatibility cruft */
-#include <e-util/gtk-compat.h>
-
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
 
 static gint ea_gnome_calendar_get_n_children (AtkObject* obj);
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index c598c4289f..f922985819 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -27,9 +27,6 @@
 #include <text/e-text.h>
 #include <glib/gi18n.h>
 
-/* backward-compatibility cruft */
-#include <e-util/gtk-compat.h>
-
 static void ea_week_view_class_init (EaWeekViewClass *klass);
 
 static G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index c27cfcc5e4..11b1e29ee5 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -68,9 +68,6 @@
 #include "e-memo-table.h"
 #include "e-task-table.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 /* Private part of the GnomeCalendar structure */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 8cf6367b0f..c2165f6d16 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -34,9 +34,6 @@
 #include <e-util/e-util.h>
 #include "weekday-picker.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define PADDING 2
 
 /* Private part of the WeekdayPicker structure */
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 33c921d892..7a9a4fa412 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -42,9 +42,6 @@
 #include <mail/mail-mt.h>
 #include <mail/e-mail-store.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	CTRL_W_PRESSED,
 	CTRL_Q_PRESSED,
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 230d2f4fec..20a39963ae 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -60,9 +60,6 @@
 #include <X11/XF86keysym.h>
 #endif
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MSG_COMPOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MSG_COMPOSER, EMsgComposerPrivate))
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 3f4388ebe1..a92f615263 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -136,7 +136,6 @@ libeutil_la_SOURCES =				\
 	e-util-private.h			\
 	e-xml-utils.c				\
 	gconf-bridge.c				\
-	gtk-compat.h				\
 	$(PLATFORM_SOURCES)
 
 libeutil_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 81a84746f6..df5ec1dbcb 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -129,10 +129,6 @@ alert_dialog_constructed (GObject *object)
 	action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
-
 	gtk_widget_ensure_style (GTK_WIDGET (dialog));
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 39f0e36e0f..471ca29700 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -25,9 +25,6 @@
 #include "e-datetime-format.h"
 #include "e-util.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define KEYS_FILENAME "datetime-formats.ini"
 #define KEYS_GROUPNAME "formats"
 
@@ -497,6 +494,7 @@ unref_setup_keyfile (gpointer ptr)
 void
 e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *component, const gchar *part, DTFormatKind kind, const gchar *caption)
 {
+	GtkListStore *store;
 	GtkWidget *label, *combo, *preview, *align;
 	gchar *key;
 
@@ -508,23 +506,15 @@ e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *com
 	key = gen_key (component, part, kind);
 
 	label = gtk_label_new_with_mnemonic (caption ? caption : _("Format:"));
-#if GTK_CHECK_VERSION(2,23,0)
-	/* FIXME Rewrite this when removing the version check. */
-	{
-		GtkListStore *store;
-
-		store = gtk_list_store_new (1, G_TYPE_STRING);
-		combo = g_object_new (
-			GTK_TYPE_COMBO_BOX_TEXT,
-			"model", store,
-			"has-entry", TRUE,
-			"entry-text-column", 0,
-			NULL);
-		g_object_unref (store);
-	}
-#else
-	combo = gtk_combo_box_entry_new_text ();
-#endif
+
+	store = gtk_list_store_new (1, G_TYPE_STRING);
+	combo = g_object_new (
+		GTK_TYPE_COMBO_BOX_TEXT,
+		"model", store,
+		"has-entry", TRUE,
+		"entry-text-column", 0,
+		NULL);
+	g_object_unref (store);
 
 	fill_combo_formats (combo, key, kind);
 	gtk_label_set_mnemonic_widget ((GtkLabel *)label, combo);
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index 8ff3b28778..4e04bc3c18 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -25,9 +25,6 @@
 
 #include "e-plugin-util.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 /* name of a property on a widget with corresponding property name for an ESource */
 #define EPU_SP_NAME "e-source-property-name"
 
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 3851590f0f..d69c53aa8d 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -29,9 +29,6 @@
 #include "e-text-event-processor-emacs-like.h"
 #include "e-util.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static gint	e_text_event_processor_emacs_like_event
 						(ETextEventProcessor *tep,
 						 ETextEventProcessorEvent *event);
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index 59e94aa25e..46d6a6c996 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -39,9 +39,6 @@
 #include <glib/gi18n.h>
 #include "e-unicode.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 #define FONT_TESTING
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 4c2764de4b..88fcfaebfb 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -57,14 +57,6 @@
 
 #include "e-util.h"
 #include "e-util-private.h"
-#include "gtk-compat.h"
-
-#if !GTK_CHECK_VERSION (2,23,0)
-	#undef GtkComboBoxText
-	ENSURE_GTK_COMBO_BOX_TEXT_TYPE
-#else
-	ENSURE_GTK_COMBO_BOX_ENTRY_TYPE
-#endif
 
 /**
  * e_get_gnome2_user_dir:
diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h
deleted file mode 100644
index 7e4ab693c9..0000000000
--- a/e-util/gtk-compat.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef __GTK_COMPAT_H__
-#define __GTK_COMPAT_H__
-
-#include <gtk/gtk.h>
-
-/* Provide a GTK+ compatibility layer. */
-
-#if !GTK_CHECK_VERSION (2,91,0)  /* approximately; who cares at this point */
-
-#define gtk_widget_get_preferred_size(widget, minimum_size, natural_size) \
-	(gtk_widget_size_request ((widget), ((minimum_size))))
-
-/* XXX Yes, the GtkScrollable interface is implemented by more than just
- *     GtkLayout, but it turns out GtkLayout is the only thing Evolution
- *     uses the GtkScrollable API for on the gtk3 branch. */
-#define GtkScrollable				GtkLayout
-#define GTK_SCROLLABLE				GTK_LAYOUT
-#define gtk_scrollable_get_hadjustment		gtk_layout_get_hadjustment
-#define gtk_scrollable_set_hadjustment		gtk_layout_set_hadjustment
-#define gtk_scrollable_get_vadjustment		gtk_layout_get_vadjustment
-#define gtk_scrollable_set_vadjustment		gtk_layout_set_vadjustment
-
-#endif
-
-#if !GTK_CHECK_VERSION (2,23,0)
-#define gtk_combo_box_text_new			gtk_combo_box_new_text
-#define gtk_combo_box_text_append_text		gtk_combo_box_append_text
-#define gtk_combo_box_text_prepend_text		gtk_combo_box_prepend_text
-#define gtk_combo_box_text_get_active_text	gtk_combo_box_get_active_text
-#define GTK_COMBO_BOX_TEXT			GTK_COMBO_BOX
-#define GTK_IS_COMBO_BOX_TEXT			GTK_IS_COMBO_BOX
-#define GtkComboBoxText				GtkComboBox
-
-/* The below can be used only once in sources */
-#define ENSURE_GTK_COMBO_BOX_TEXT_TYPE						\
-	GType gtk_combo_box_text_get_type (void);				\
-	typedef struct _GtkComboBoxText GtkComboBoxText;			\
-	typedef struct _GtkComboBoxTextClass GtkComboBoxTextClass;		\
-										\
-	struct _GtkComboBoxText {						\
-		GtkComboBox parent;						\
-	};									\
-										\
-	struct _GtkComboBoxTextClass {						\
-		GtkComboBoxClass parent_class;					\
-	};									\
-										\
-										\
-	G_DEFINE_TYPE (GtkComboBoxText, gtk_combo_box_text, GTK_TYPE_COMBO_BOX)	\
-										\
-	static void gtk_combo_box_text_init (GtkComboBoxText *cbt) {}		\
-	static void gtk_combo_box_text_class_init (GtkComboBoxTextClass *kl) {}
-
-static inline gint
-gdk_window_get_width (GdkWindow *window)
-{
-	gint width, height;
-
-	gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height);
-
-	return width;
-}
-
-static inline gint
-gdk_window_get_height (GdkWindow *window)
-{
-	gint width, height;
-
-	gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height);
-
-	return height;
-}
-#endif
-
-#if GTK_CHECK_VERSION (2,23,0)
-#define GTK_COMBO_BOX_ENTRY			GTK_COMBO_BOX
-
-#define ENSURE_GTK_COMBO_BOX_ENTRY_TYPE						\
-	GType gtk_combo_box_entry_get_type (void);				\
-	typedef struct _GtkComboBoxEntry GtkComboBoxEntry;			\
-	typedef struct _GtkComboBoxEntryClass GtkComboBoxEntryClass;		\
-										\
-	struct _GtkComboBoxEntry {						\
-		GtkComboBoxText parent;						\
-	};									\
-										\
-	struct _GtkComboBoxEntryClass {						\
-		GtkComboBoxTextClass parent_class;				\
-	};									\
-										\
-	G_DEFINE_TYPE (GtkComboBoxEntry, gtk_combo_box_entry, GTK_TYPE_COMBO_BOX_TEXT)\
-										\
-	static GObject *							\
-	gtk_combo_box_entry_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties) \
-	{									\
-		GObjectConstructParam *params = g_new0 (GObjectConstructParam, n_construct_properties + 1);\
-		GValue val = {0};						\
-		GObject *res;							\
-		gint ii;							\
-										\
-		for (ii = 0; ii < n_construct_properties; ii++) {		\
-			params[ii] = construct_properties[ii];			\
-		}								\
-										\
-		g_value_init (&val, G_TYPE_BOOLEAN);				\
-		g_value_set_boolean (&val, TRUE);				\
-										\
-		params[n_construct_properties].pspec = g_object_class_find_property (G_OBJECT_CLASS (gtk_combo_box_entry_parent_class), "has-entry");\
-		params[n_construct_properties].value = &val;			\
-										\
-		res = G_OBJECT_CLASS (gtk_combo_box_entry_parent_class)->constructor (type, n_construct_properties + 1, params);\
-										\
-		g_free (params);						\
-		return res;							\
-	}									\
-	static void gtk_combo_box_entry_init (GtkComboBoxEntry *cbt) {}		\
-	static void gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *kl)	\
-	{									\
-		GObjectClass *object_class = G_OBJECT_CLASS (kl);		\
-		object_class->constructor = gtk_combo_box_entry_constructor;	\
-	}
-#else
-#define gtk_combo_box_set_entry_text_column \
-	gtk_combo_box_entry_set_text_column
-#endif
-
-#if GTK_CHECK_VERSION (2,90,5)
-
-/* Recreate GdkRegion until we drop GTK2 compatibility. */
-#define GdkOverlapType cairo_region_overlap_t
-#define GDK_OVERLAP_RECTANGLE_IN   CAIRO_REGION_OVERLAP_IN
-#define GDK_OVERLAP_RECTANGLE_OUT  CAIRO_REGION_OVERLAP_OUT
-#define GDK_OVERLAP_RECTANGLE_PART CAIRO_REGION_OVERLAP_PART
-
-#define GdkRegion cairo_region_t
-
-#define gdk_region_new() \
-	(cairo_region_create ())
-
-#define gdk_region_destroy(region) \
-	(cairo_region_destroy (region))
-
-#define gdk_region_intersect(source1, source2) \
-	(cairo_region_intersect ((source1), (source2)))
-
-#define gdk_region_rect_in(region, rectangle) \
-	(cairo_region_contains_rectangle ((region), (rectangle)))
-
-#define gdk_region_rectangle(rectangle) \
-	(((rectangle)->width <= 0 || (rectangle)->height <= 0) ? \
-	cairo_region_create () : cairo_region_create_rectangle (rectangle))
-
-#define gdk_region_get_rectangles(region, rectangles, n_rectangles) \
-	G_STMT_START { \
-		GdkRectangle *__rects; \
-		gint __i, __nrects; \
-		\
-		__nrects = cairo_region_num_rectangles (region); \
-		__rects = g_new (GdkRectangle, __nrects); \
-		\
-		for (__i = 0; __i < __nrects; __i++) \
-			cairo_region_get_rectangle ((region), __i, &__rects[__i]); \
-		\
-		*(n_rectangles) = __nrects; \
-		*(rectangles) = __rects; \
-	} G_STMT_END
-
-#define gdk_region_union_with_rect(region, rect) \
-	G_STMT_START { \
-		if ((rect)->width > 0 && (rect)->height > 0) \
-			cairo_region_union_rectangle ((region), (rect)); \
-	} G_STMT_END
-
-#endif
-
-#endif /* __GTK_COMPAT_H__ */
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index db251f317b..2c79899bf6 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -288,9 +288,6 @@ button_clicked (GtkButton *button, EFilterDatespec *fds)
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 
 	p->notebook_type = e_builder_get_widget (builder, "notebook_type");
 	p->combobox_type = e_builder_get_widget (builder, "combobox_type");
diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index 16783cd433..bc61e96c24 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -36,9 +36,6 @@
 #include "e-filter-option.h"
 #include "e-filter-part.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 G_DEFINE_TYPE (
 	EFilterOption,
 	e_filter_option,
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index c2c70c4695..f80146a600 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -35,9 +35,6 @@
 #include "e-filter-rule.h"
 #include "e-rule-context.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_FILTER_RULE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_FILTER_RULE, EFilterRulePrivate))
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index 95629be738..a167d01c5d 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -775,9 +775,6 @@ e_rule_context_add_rule_gui (ERuleContext *context,
 			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			       GTK_STOCK_OK, GTK_RESPONSE_OK,
 			       NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 
 	gtk_window_set_title ((GtkWindow *) dialog, title);
 	gtk_window_set_default_size ((GtkWindow *) dialog, 600, 400);
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c
index 68c005cc38..5145c1623a 100644
--- a/filter/e-rule-editor.c
+++ b/filter/e-rule-editor.c
@@ -263,9 +263,6 @@ rule_add (GtkWidget *widget, ERuleEditor *editor)
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (editor->dialog, "has-separator", FALSE, NULL);
-#endif
 
 	gtk_window_set_title ((GtkWindow *) editor->dialog, _("Add Rule"));
 	gtk_window_set_default_size (GTK_WINDOW (editor->dialog), 650, 400);
@@ -352,9 +349,6 @@ rule_edit (GtkWidget *widget, ERuleEditor *editor)
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (editor->dialog, "has-separator", FALSE, NULL);
-#endif
 
 	gtk_window_set_title ((GtkWindow *) editor->dialog, _("Edit Rule"));
 	gtk_window_set_default_size (GTK_WINDOW (editor->dialog), 650, 400);
@@ -850,9 +844,6 @@ e_rule_editor_construct (ERuleEditor *editor,
 		G_CALLBACK (editor_response), editor);
 	rule_editor_set_source (editor, source);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (editor, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_add_buttons ((GtkDialog *) editor,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c
index e1776ff2d8..881916ac5a 100644
--- a/libgnomecanvas/gailcanvas.c
+++ b/libgnomecanvas/gailcanvas.c
@@ -29,9 +29,6 @@
 #include "gailcanvasitemfactory.h"
 #include "gailcanvaswidgetfactory.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void       gail_canvas_class_init          (GailCanvasClass *klass);
 static void       gail_canvas_real_initialize     (AtkObject       *obj,
                                                    gpointer        data);
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c
index 0cad301343..4527191991 100644
--- a/libgnomecanvas/gailcanvasitem.c
+++ b/libgnomecanvas/gailcanvasitem.c
@@ -24,9 +24,6 @@
 #include "gailcanvasitem.h"
 #include <libgail-util/gailmisc.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void       gail_canvas_item_initialize               (AtkObject         *obj,
 							     gpointer          data);
 static AtkObject* gail_canvas_item_get_parent               (AtkObject         *obj);
diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c
index 87804bdc1c..d58bc433f7 100644
--- a/libgnomecanvas/gnome-canvas-rich-text.c
+++ b/libgnomecanvas/gnome-canvas-rich-text.c
@@ -34,9 +34,6 @@
 #include "gnome-canvas-rich-text.h"
 #include "gnome-canvas-i18n.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 struct _GnomeCanvasRichTextPrivate {
 	GtkTextLayout *layout;
 	GtkTextBuffer *buffer;
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index aa76dd393c..7c17283026 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -91,9 +91,6 @@
 #include "gnome-canvas-marshal.h"
 #include "gnome-canvas-marshal.c"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 /* We must run our idle update handler *before* GDK wants to redraw. */
 #define CANVAS_IDLE_PRIORITY (GDK_PRIORITY_REDRAW - 5)
 
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 7d974dda5d..519eaf89b7 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -29,9 +29,6 @@
 #include "e-attachment-icon-view.h"
 #include "e-attachment-tree-view.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAIL_ATTACHMENT_BAR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate))
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 0665ccec11..d46217e706 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -40,9 +40,6 @@
 #include "mail/em-format-html-display.h"
 #include "mail/message-list.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAIL_BROWSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_BROWSER, EMailBrowserPrivate))
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index c2eada3203..34a148c7a9 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -197,9 +197,6 @@ mail_label_dialog_init (EMailLabelDialog *dialog)
 		GTK_DIALOG (dialog),
 		GTK_STOCK_OK, GTK_RESPONSE_OK);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
 	container = content_area;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index b9a3b8b584..3f1e40af85 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -59,9 +59,6 @@
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAIL_READER_GET_PRIVATE(obj) \
 	((EMailReaderPrivate *) g_object_get_qdata \
 	(G_OBJECT (obj), quark_private))
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index 659d00aa6e..a116b3f5e2 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -33,9 +33,6 @@
 #include "e-util/e-util.h"
 #include "widgets/misc/e-dateedit.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAIL_TAG_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_TAG_EDITOR, EMailTagEditorPrivate))
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 71919a2e11..714822bcde 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -33,9 +33,6 @@
 #include "em-filter-rule.h"
 #include "em-filter-context.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 static gint validate (EFilterRule *fr, EAlert **alert);
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 4043f42eab..ab4c049183 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -36,9 +36,6 @@
 
 #include "filter/e-filter-part.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void em_filter_source_element_class_init (EMFilterSourceElementClass *klass);
 static void em_filter_source_element_init (EMFilterSourceElement *fs);
 static void em_filter_source_element_finalize (GObject *obj);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 9304adda5c..5fd42c11b9 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -65,9 +65,6 @@
 #include "e-mail-local.h"
 #include "e-mail-session.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 #define EM_FOLDER_TREE_GET_PRIVATE(obj) \
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index db278b8a63..1ccab1aaca 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -33,9 +33,6 @@
 
 #include "em-folder-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate))
diff --git a/mail/message-list.c b/mail/message-list.c
index 4ce094f42a..ef1eac2278 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -68,9 +68,6 @@
 #include "mail-tools.h"
 #include "message-list.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #if HAVE_CLUTTER
 #include <clutter/clutter.h>
 #include <mx/mx.h>
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 2f015855db..9c5a26ac5d 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -49,9 +49,6 @@
 
 #include "addressbook/gui/widgets/eab-config.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 #ifdef HAVE_LDAP
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index b0b9592210..7c2a2721f1 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -55,9 +55,6 @@
 #include "e-book-shell-sidebar.h"
 #include "e-book-shell-view-actions.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_BOOK_SHELL_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_BOOK_SHELL_VIEW, EBookShellViewPrivate))
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index a9f5237ecc..8fea91ffeb 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -264,9 +264,6 @@ attachment_handler_run_dialog (GtkWindow *parent,
 		GTK_DIALOG (dialog), widget, GTK_RESPONSE_OK);
 	gtk_widget_show (widget);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 9f028e0e8a..a3aa3455e4 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -66,9 +66,6 @@
 #include "e-mail-shell-sidebar.h"
 #include "e-mail-shell-view-actions.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAIL_SHELL_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_SHELL_VIEW, EMailShellViewPrivate))
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 267195bfbb..8bec111b6e 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -50,9 +50,6 @@
 #include "em-junk.h"
 #include "em-config.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	HEADER_LIST_NAME_COLUMN, /* displayable name of the header (may be a translation) */
 	HEADER_LIST_ENABLED_COLUMN, /* is the header enabled? */
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index e12a945177..42c661a541 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -117,9 +117,6 @@ mailto_handler_prompt (EMailtoHandler *extension)
 		GTK_STOCK_YES, GTK_RESPONSE_YES,
 		NULL);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 555eebe2d8..9334de3b20 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -709,9 +709,6 @@ main (gint argc, gchar **argv)
 							  GTK_RESPONSE_REJECT,
 							  NULL);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-		g_object_set (progress_dialog, "has-separator", FALSE, NULL);
-#endif
 		gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12);
 
 		action_area = gtk_dialog_get_action_area (
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index 46c7c9f923..95937e0dbf 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -40,7 +40,6 @@
 
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-account-utils.h>
-#include <e-util/gtk-compat.h>
 
 #include "caldav-browse-server.h"
 
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index b554843d65..e81411a153 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -27,9 +27,6 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 gint e_plugin_lib_enable (EPlugin *ep, gint enable);
 
 gint
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 3dda9ebd4a..45cb5c48ed 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -37,9 +37,6 @@
 #include <libgweather/gweather-xml.h>
 #undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 GtkWidget *e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget *e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget *e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data);
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 6deb67a8e6..24e76e3d6c 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -35,9 +35,6 @@
 #include "e-util/e-util.h"
 #include "email-custom-header.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
 
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 97ddc5b8a2..be215706ba 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -47,9 +47,6 @@
 
 #include <gconf/gconf-client.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 #define EDITOR_GCONF_KEY_COMMAND "/apps/evolution/eplugin/external-editor/editor-command"
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 0fe49911b0..85e52df1c3 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -37,9 +37,6 @@
 
 #include "google-contacts-source.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 void
 ensure_google_contacts_source_group (void)
 {
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 6e527d653c..20b5a2d5e3 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -38,9 +38,6 @@
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define PRIMARY_TEXT \
 	N_("Also mark messages in subfolders?")
 #define SECONDARY_TEXT \
@@ -114,9 +111,6 @@ prompt_user (gboolean has_subfolders)
 	dialog = gtk_dialog_new ();
 	widget = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 	gtk_widget_hide (widget);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_window_set_title (GTK_WINDOW (dialog), "");
 	g_signal_connect (
 		dialog, "map",
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 89bec64276..4af662def4 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -29,9 +29,6 @@
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static GtkDialogClass *parent_class = NULL;
 
 static void
@@ -381,9 +378,6 @@ url_editor_dialog_construct (UrlEditorDialog *dialog)
 	gtk_container_add (GTK_CONTAINER (content_area), toplevel);
 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 
 	dialog->cancel = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	dialog->ok = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index a97c095947..6af94ddc37 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -44,9 +44,6 @@
 #include "e-shell-view.h"
 #include "e-shell-window-actions.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SHELL_CONTENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SHELL_CONTENT, EShellContentPrivate))
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 2200ed3fd1..9244d792a7 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -37,9 +37,6 @@
 
 #include "e-shell-window-actions.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SHELL_SEARCHBAR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate))
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index e460d30100..5aa16e019d 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,9 +31,6 @@
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SHELL_SIDEBAR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SHELL_SIDEBAR, EShellSidebarPrivate))
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 6dbcc86fb1..2d2d13c153 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -30,9 +30,6 @@
 #include <glib/gi18n.h>
 #include <e-util/e-extensible.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SHELL_SWITCHER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SHELL_SWITCHER, EShellSwitcherPrivate))
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index cf0ee93df2..1c9ee99de0 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -314,11 +314,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 	if (widget != NULL)
 		gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(2,90,7)
 	widget = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#else
-	widget = gtk_hpaned_new ();
-#endif
 	gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
 	priv->content_pane = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 79f15acb68..3faf3be50c 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -49,9 +49,6 @@
 #include <e-shell-window-actions.h>
 #include <e-shell-utils.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SHELL_WINDOW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SHELL_WINDOW, EShellWindowPrivate))
diff --git a/shell/main.c b/shell/main.c
index da7a235a0a..bad10a3f5a 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -171,9 +171,6 @@ show_development_warning (void)
 	gtk_dialog_add_button (
 		GTK_DIALOG (warning_dialog),
 		GTK_STOCK_OK, GTK_RESPONSE_OK);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (warning_dialog, "has-separator", FALSE, NULL);
-#endif
 
 	action_area = gtk_dialog_get_action_area (GTK_DIALOG (warning_dialog));
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (warning_dialog));
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 04b00a016d..8cacf1a849 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -247,9 +247,6 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 	/* TODO: add position/size saving/restoring */
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 360);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 
 	gtk_dialog_add_buttons (
 		GTK_DIALOG (dialog),
diff --git a/widgets/misc/e-account-manager.c b/widgets/misc/e-account-manager.c
index 0c9e464657..d8415f8d3a 100644
--- a/widgets/misc/e-account-manager.c
+++ b/widgets/misc/e-account-manager.c
@@ -25,9 +25,6 @@
 #include <gdk/gdkkeysyms.h>
 #include "e-account-tree-view.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_ACCOUNT_MANAGER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate))
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index 19af142ac7..7cadf574f7 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -23,9 +23,6 @@
 
 #include "e-attachment-button.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_ATTACHMENT_BUTTON_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate))
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index 24fe7b4049..cb504219df 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -306,9 +306,6 @@ e_attachment_dialog_init (EAttachmentDialog *dialog)
 	gtk_window_set_title (
 		GTK_WINDOW (dialog), _("Attachment Properties"));
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index f15b871b1c..3158c363d9 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -30,9 +30,6 @@
 #include "e-attachment-icon-view.h"
 #include "e-attachment-tree-view.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_ATTACHMENT_PANED_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate))
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 8958ad0980..0a3a29aa77 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -33,9 +33,6 @@
 #include "e-attachment-handler-image.h"
 #include "e-attachment-handler-sendto.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	UPDATE_ACTIONS,
 	LAST_SIGNAL
diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c
index 55a9e34e57..feef06c21e 100644
--- a/widgets/misc/e-buffer-tagger.c
+++ b/widgets/misc/e-buffer-tagger.c
@@ -29,9 +29,6 @@
 #include "e-util/e-util.h"
 #include "e-buffer-tagger.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum EBufferTaggerState
 {
 	E_BUFFER_TAGGER_STATE_NONE                = 0,
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index e34e0d4428..96193894f8 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -38,9 +38,6 @@
 #include <e-util/e-util.h>
 #include <e-util/e-extensible.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static const gint e_calendar_item_days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index bbf10b60af..fda5cd86e8 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -23,9 +23,6 @@
 
 #include "e-canvas-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 void
 e_canvas_item_move_absolute (GnomeCanvasItem *item, gdouble dx, gdouble dy)
 {
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 270c55c27d..ef9e7f043d 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -34,9 +34,6 @@
 #include "e-canvas-utils.h"
 #include "e-canvas-vbox.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void e_canvas_vbox_dispose (GObject *object);
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index 03156f1801..9c2c2883b2 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -27,9 +27,6 @@
 #include "e-combo-cell-editable.h"
 #include "e-cell-renderer-combo.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	PROP_0,
 	PROP_LIST
diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c
index 5f542a6d48..e2cf06e3d1 100644
--- a/widgets/misc/e-charset-combo-box.c
+++ b/widgets/misc/e-charset-combo-box.c
@@ -103,9 +103,6 @@ charset_combo_box_run_dialog (ECharsetComboBox *combo_box)
 
 	dialog = GTK_DIALOG (widget);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index 613fc7b2f6..f108e71f55 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -25,9 +25,6 @@
 
 #include "e-combo-cell-editable.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 struct _EComboCellEditablePriv {
 	GtkEntry *entry;
 	GtkWidget *popup;
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 098825a321..8aa048cb28 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -43,9 +43,6 @@
 #include <e-util/e-extensible.h>
 #include "e-calendar.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_DATE_EDIT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_DATE_EDIT, EDateEditPrivate))
@@ -571,17 +568,8 @@ create_children			(EDateEdit	*dedit)
 		"widget \"*.e-dateedit-timecombo\" style \"e-dateedit-timecombo-style\"");
 
 	time_store = gtk_list_store_new (1, G_TYPE_STRING);
-#if GTK_CHECK_VERSION(2,23,0)
-	priv->time_combo = g_object_new (
-		GTK_TYPE_COMBO_BOX_TEXT,
-		"model", time_store,
-		"has-entry", TRUE,
-		"entry-text-column", 0,
-		NULL);
-#else
-	priv->time_combo = gtk_combo_box_entry_new_with_model (
-		GTK_TREE_MODEL (time_store), 0);
-#endif
+	priv->time_combo = gtk_combo_box_new_with_model_and_entry (
+		GTK_TREE_MODEL (time_store));
 	g_object_unref (time_store);
 
 	child = gtk_bin_get_child (GTK_BIN (priv->time_combo));
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index c01f35b3d7..e9a497f4c4 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -30,9 +30,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-icon-factory.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate))
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 9ff1a5c391..55ea1bbc62 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -33,9 +33,6 @@
 #include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_IMPORT_ASSISTANT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_IMPORT_ASSISTANT, EImportAssistantPrivate))
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 165a9c702f..89ca22b76a 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -33,9 +33,6 @@
 
 #include "e-map.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_MAP_TWEEN_TIMEOUT_MSECS 25
 #define E_MAP_TWEEN_DURATION_MSECS 150
 
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 20f1c7a068..023c3e058f 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -25,9 +25,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <e-util/e-util.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define SWITCH_PAGE_INTERVAL 250
 
 #define E_PREFERENCES_WINDOW_GET_PRIVATE(obj) \
diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c
index f6617ad29a..b6a06ccfe5 100644
--- a/widgets/misc/e-preview-pane.c
+++ b/widgets/misc/e-preview-pane.c
@@ -23,9 +23,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_PREVIEW_PANE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_PREVIEW_PANE, EPreviewPanePrivate))
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 695eb112e7..0b0589bfa6 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -25,9 +25,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtkhtml/gtkhtml-search.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SEARCH_BAR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SEARCH_BAR, ESearchBarPrivate))
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 44a22d6eb3..d5ce69a1a6 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -29,9 +29,6 @@
 
 #include "e-selection-model.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 G_DEFINE_TYPE (
 	ESelectionModel,
 	e_selection_model,
diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c
index 43b6be6c63..f7529d37e4 100644
--- a/widgets/misc/e-signature-manager.c
+++ b/widgets/misc/e-signature-manager.c
@@ -27,9 +27,6 @@
 #include "e-signature-tree-view.h"
 #include "e-signature-script-dialog.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_SIGNATURE_MANAGER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate))
diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c
index 1d514f5da0..1364737735 100644
--- a/widgets/misc/e-signature-script-dialog.c
+++ b/widgets/misc/e-signature-script-dialog.c
@@ -242,9 +242,6 @@ e_signature_script_dialog_init (ESignatureScriptDialog *dialog)
 		GTK_DIALOG (dialog),
 		GTK_STOCK_SAVE, GTK_RESPONSE_OK);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
 	container = content_area;
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 168061e4e7..a54f6c9c98 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -68,9 +68,6 @@
 #include "e-cell-combo.h"
 #include "e-cell-text.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 /* The height to make the popup list if there aren't any items in it. */
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index a71d3cc76c..770ac77f0a 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -48,9 +48,6 @@
 /* This depends on ECalendar which is why I didn't put it in gal. */
 #include <misc/e-calendar.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_cell_date_edit_get_property	(GObject	*object,
 						 guint		 property_id,
 						 GValue		*value,
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 5e89b6c37d..dfc9526885 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -41,9 +41,6 @@
 #include "e-table-item.h"
 #include <gtk/gtk.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_CELL_POPUP_ARROW_WIDTH	16
 #define E_CELL_POPUP_ARROW_XPAD		3
 #define E_CELL_POPUP_ARROW_YPAD		3
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index a4160419ae..83338fc1e7 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -56,9 +56,6 @@
 #include "e-cell-text.h"
 #include "e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 #define DO_SELECTION 1
 #define VIEW_TO_CELL(view) E_CELL_TEXT (((ECellView *)view)->ecell)
@@ -770,7 +767,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 
 	if (edit && edit->view_col == view_col && edit->row == row) {
 		if (edit->selection_start != edit->selection_end) {
-			GdkRegion *clip_region;
+			cairo_region_t *clip_region;
                         gint indices[2];
                         GtkStateType state;
 
@@ -784,7 +781,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
                                                                         indices, 1);
                         gdk_cairo_region (cr, clip_region);
                         cairo_clip (cr);
-			gdk_region_destroy (clip_region);
+			cairo_region_destroy (clip_region);
 
                         gdk_cairo_set_source_color (cr, &style->base[state]);
                         cairo_paint (cr);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 8ceca7c966..d988f801ae 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -38,9 +38,6 @@
 #include "e-cell-toggle.h"
 #include "e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_CELL_TOGGLE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_CELL_TOGGLE, ECellTogglePrivate))
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index d983c1b935..d7a1e7f237 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -39,9 +39,6 @@
 #include "e-table-header.h"
 #include "e-table-one.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	CURSOR_CHANGE,
 	STYLE_SET,
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 557785df0c..e038271b86 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -34,9 +34,6 @@
 #include "e-table-field-chooser.h"
 #include "e-table-field-chooser-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dispose (GObject *object);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 6e8bbf4e61..f9c12b2a9a 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -39,9 +39,6 @@
 #include "e-table-item.h"
 #include "e-table-sorting-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define TITLE_HEIGHT         16
 
 /* workaround for avoiding API breakage */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2e7b4704ec..284565165d 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -50,9 +50,6 @@
 #include "arrow-up.xpm"
 #include "arrow-down.xpm"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	BUTTON_PRESSED,
 	LAST_SIGNAL
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index b6421bb439..57d5c80963 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -48,9 +48,6 @@
 #include "e-table-item.h"
 #include "e-table-subset.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 /* workaround for avoiding API breakage */
 #define eti_get_type e_table_item_get_type
 G_DEFINE_TYPE (ETableItem, eti, GNOME_TYPE_CANVAS_ITEM)
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index aad7c9f729..d21137ef04 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -52,9 +52,6 @@
 #include "e-table-subset.h"
 #include "e-table-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define COLUMN_HEADER_HEIGHT 16
 
 #define d(x)
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index bcad41a797..39bfd40d6c 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -52,9 +52,6 @@
 #include "e-tree.h"
 #include "e-tree-table-adapter.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define COLUMN_HEADER_HEIGHT 16
 
 #define d(x)
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index a282f862e3..89894ab99d 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -32,9 +32,6 @@
 #include "gal-a11y-e-cell-popup.h"
 #include "gal-a11y-e-cell-registry.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static AtkObjectClass *parent_class = NULL;
 #define PARENT_TYPE (gal_a11y_e_cell_get_type ())
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 7139b41fe3..c6ba4e7d2b 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -33,9 +33,6 @@
 #include "gal-a11y-e-table-factory.h"
 #include "gal-a11y-e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass))
 static AtkObjectClass *parent_class;
 static GType parent_type;
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 193d3eb9d7..d474f96af5 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -30,9 +30,6 @@
 #include "gal-a11y-e-tree.h"
 #include "gal-a11y-e-tree-factory.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
 static AtkObjectClass *parent_class;
 static GType parent_type;
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 5eb31cae8b..535d468450 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -37,9 +37,6 @@
 #include "e-reflow.h"
 #include "misc/e-selection-model-simple.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);
 static void e_reflow_realize (GnomeCanvasItem *item);
 static void e_reflow_unrealize (GnomeCanvasItem *item);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index c6d3d81502..d2c5d846ba 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -55,9 +55,6 @@
 
 #include "e-text.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 G_DEFINE_TYPE (EText, e_text, GNOME_TYPE_CANVAS_ITEM)
 
 #define BORDER_INDENT 3
@@ -1481,7 +1478,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 
 	if (text->editing) {
 		if (text->selection_start != text->selection_end) {
-			GdkRegion *clip_region = gdk_region_new ();
+			cairo_region_t *clip_region = cairo_region_create ();
 			gint indices[2];
                         GtkStateType state;
 
@@ -1499,7 +1496,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
                                                                         indices, 1);
                         gdk_cairo_region (cr, clip_region);
                         cairo_clip (cr);
-			gdk_region_destroy (clip_region);
+			cairo_region_destroy (clip_region);
 
                         gdk_cairo_set_source_color (cr, &style->base[state]);
                         cairo_paint (cr);