From 9194ee4973de9f3ff2a68d7135bf79d8c0e56ca3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 14 Dec 2017 23:35:08 -0500
Subject: [PATCH] gdk: Drop GDK_DAMAGE

We haven't been generating events of this type
since we dropped offscreen windows.
---
 gdk/gdkevents.c        | 4 ----
 gdk/gdkevents.h        | 3 ---
 gdk/gdkeventsprivate.h | 2 +-
 gtk/gtkmain.c          | 1 -
 gtk/gtkwidget.c        | 1 -
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index a3ec633453..9f788a863d 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -652,7 +652,6 @@ gdk_event_copy (const GdkEvent *event)
       break;
 
     case GDK_EXPOSE:
-    case GDK_DAMAGE:
       if (event->expose.region)
         new_event->expose.region = cairo_region_copy (event->expose.region);
       break;
@@ -755,7 +754,6 @@ gdk_event_finalize (GObject *object)
       break;
 
     case GDK_EXPOSE:
-    case GDK_DAMAGE:
       if (event->expose.region)
 	cairo_region_destroy (event->expose.region);
       break;
@@ -859,7 +857,6 @@ gdk_event_get_time (const GdkEvent *event)
       case GDK_CONFIGURE:
       case GDK_FOCUS_CHANGE:
       case GDK_NOTHING:
-      case GDK_DAMAGE:
       case GDK_DELETE:
       case GDK_DESTROY:
       case GDK_EXPOSE:
@@ -930,7 +927,6 @@ gdk_event_get_state (const GdkEvent        *event,
       case GDK_FOCUS_CHANGE:
       case GDK_PROXIMITY_IN:
       case GDK_PROXIMITY_OUT:
-      case GDK_DAMAGE:
       case GDK_DRAG_ENTER:
       case GDK_DRAG_LEAVE:
       case GDK_DRAG_MOTION:
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 6e61b1f95d..c4e70c81b6 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -246,8 +246,6 @@ typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
  * @GDK_SCROLL: the scroll wheel was turned
  * @GDK_GRAB_BROKEN: a pointer or keyboard grab was broken. This event type
  *   was added in 2.8.
- * @GDK_DAMAGE: the content of the window has been changed. This event type
- *   was added in 2.14.
  * @GDK_TOUCH_BEGIN: A new touch event sequence has just started. This event
  *   type was added in 3.4.
  * @GDK_TOUCH_UPDATE: A touch event sequence has been updated. This event type
@@ -305,7 +303,6 @@ typedef enum
   GDK_DROP_FINISHED,
   GDK_SCROLL,
   GDK_GRAB_BROKEN,
-  GDK_DAMAGE,
   GDK_TOUCH_BEGIN,
   GDK_TOUCH_UPDATE,
   GDK_TOUCH_END,
diff --git a/gdk/gdkeventsprivate.h b/gdk/gdkeventsprivate.h
index 4e6e438f86..cf582314bb 100644
--- a/gdk/gdkeventsprivate.h
+++ b/gdk/gdkeventsprivate.h
@@ -65,7 +65,7 @@ struct _GdkEventAny
 
 /**
  * GdkEventExpose:
- * @type: the type of the event (%GDK_EXPOSE or %GDK_DAMAGE).
+ * @type: the type of the event (%GDK_EXPOSE)
  * @window: the window which received the event.
  * @send_event: %TRUE if the event was sent explicitly.
  * @area: bounding box of @region.
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d2c5abe5a4..e127786323 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1811,7 +1811,6 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_MAP:
     case GDK_UNMAP:
     case GDK_GRAB_BROKEN:
-    case GDK_DAMAGE:
       if (!_gtk_widget_captured_event (event_widget, event))
         gtk_widget_event (event_widget, event);
       break;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 03ec32407f..6dbcaea36b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6554,7 +6554,6 @@ gtk_widget_emit_event_signals (GtkWidget      *widget,
         case GDK_DRAG_STATUS:
         case GDK_DROP_START:
         case GDK_DROP_FINISHED:
-        case GDK_DAMAGE:
         case GDK_EVENT_LAST:
         case GDK_TOUCHPAD_SWIPE:
         case GDK_TOUCHPAD_PINCH: