From ec750bed0c0da8f5d0459060d9dc89d08a89cb28 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 16 Jan 2011 17:03:40 +0100
Subject: [PATCH] gdk: Remove colormap debug category

We don't have colormaps anymore.
---
 gdk/gdk.c                    |  1 -
 gdk/gdkinternals.h           | 23 +++++++++++------------
 gdk/win32/gdkprivate-win32.h |  2 --
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 47e4742f96..5182d72e2f 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -129,7 +129,6 @@ static const GDebugKey gdk_debug_keys[] = {
   {"dnd",           GDK_DEBUG_DND},
   {"xim",           GDK_DEBUG_XIM},
   {"nograbs",       GDK_DEBUG_NOGRABS},
-  {"colormap",      GDK_DEBUG_COLORMAP},
   {"input",         GDK_DEBUG_INPUT},
   {"cursor",        GDK_DEBUG_CURSOR},
   {"multihead",     GDK_DEBUG_MULTIHEAD},
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index e7baa04a68..bb33e090f7 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -74,18 +74,17 @@ struct _GdkClientFilter {
 };
 
 typedef enum {
-  GDK_DEBUG_MISC          = 1 << 0,
-  GDK_DEBUG_EVENTS        = 1 << 1,
-  GDK_DEBUG_DND           = 1 << 2,
-  GDK_DEBUG_XIM           = 1 << 3,
-  GDK_DEBUG_NOGRABS       = 1 << 4,
-  GDK_DEBUG_COLORMAP      = 1 << 5,
-  GDK_DEBUG_INPUT         = 1 << 6,
-  GDK_DEBUG_CURSOR        = 1 << 7,
-  GDK_DEBUG_MULTIHEAD     = 1 << 8,
-  GDK_DEBUG_XINERAMA      = 1 << 9,
-  GDK_DEBUG_DRAW          = 1 <<10,
-  GDK_DEBUG_EVENTLOOP     = 1 <<11
+  GDK_DEBUG_MISC          = 1 <<  0,
+  GDK_DEBUG_EVENTS        = 1 <<  1,
+  GDK_DEBUG_DND           = 1 <<  2,
+  GDK_DEBUG_XIM           = 1 <<  3,
+  GDK_DEBUG_NOGRABS       = 1 <<  4,
+  GDK_DEBUG_INPUT         = 1 <<  5,
+  GDK_DEBUG_CURSOR        = 1 <<  6,
+  GDK_DEBUG_MULTIHEAD     = 1 <<  7,
+  GDK_DEBUG_XINERAMA      = 1 <<  8,
+  GDK_DEBUG_DRAW          = 1 <<  9,
+  GDK_DEBUG_EVENTLOOP     = 1 << 10
 } GdkDebugFlag;
 
 extern GList            *_gdk_default_filters;
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 2889e66cb6..7ed9c15d7e 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -99,9 +99,7 @@
 
 
 /* Define some combinations of GdkDebugFlags */
-#define GDK_DEBUG_EVENTS_OR_COLORMAP (GDK_DEBUG_EVENTS|GDK_DEBUG_COLORMAP)
 #define GDK_DEBUG_EVENTS_OR_INPUT (GDK_DEBUG_EVENTS|GDK_DEBUG_INPUT)
-#define GDK_DEBUG_MISC_OR_COLORMAP (GDK_DEBUG_MISC|GDK_DEBUG_COLORMAP)
 #define GDK_DEBUG_MISC_OR_EVENTS (GDK_DEBUG_MISC|GDK_DEBUG_EVENTS)
 
 GdkScreen *GDK_WINDOW_SCREEN(GObject *win);