Drop backward-compatibility cruft.

17 files changed, 25 insertions, 70 deletions

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 */