Drop backward-compatibility cruft.

40 files changed, 6 insertions, 135 deletions

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);