Re: Outstanding patches, #58330

["Matthias Clasen" <matthiasc poet de>]

Here is a patch removing unused debug flags, parallel to the debugging.txt
update.
Doing this lead to the discovery that some of the seemingly unused debug
flags
are in fact used only via GDK_NOTE/GTK_NOTE.

Ok to commit ?


Index: docs/debugging.txt
===================================================================
RCS file: /cvs/gnome/gtk+/docs/debugging.txt,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 debugging.txt
--- docs/debugging.txt 1998/04/06 12:59:03 1.3
+++ docs/debugging.txt 2001/08/13 10:23:59
@@ -67,16 +67,10 @@ For instance:

 runs testgtk with the 'misc' and 'events' debugging options.

- GTK_DEBUG
- ---------
-
- Application relevant options:
+See glib/docs/debugging.txt for information about debugging signal emission
+and the object system.

- 'objects' - Trace the creation and destruction of objects, print
-             out a summary at program termination

- Options only interesting to library maintainers:
-
  GDK_DEBUG
  ---------

@@ -88,9 +82,18 @@ runs testgtk with the 'misc' and 'events

  'misc'          - Miscellaneous information
  'dnd'           - Information about drag-and-drop
- 'color-context' - Information about the internal workings of
-                   GdkColorContext
  'xim'           - Information about X Input Method support
+
+
+ GTK_DEBUG
+ ---------
+
+ Options only interesting to library maintainers:
+
+ 'misc'          - Miscellaneous information
+ 'text'          - Information about text widget internals
+ 'tree'          - Information about tree widget internals
+ 'updates'       - Visual feedback about window updates


                                     - Owen Taylor <owt1 cornell edu>
Index: gdk/gdk.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdk.c,v
retrieving revision 1.128
diff -u -3 -p -u -r1.128 gdk.c
--- gdk/gdk.c 2001/06/29 02:54:54 1.128
+++ gdk/gdk.c 2001/08/13 10:23:59
@@ -73,7 +73,6 @@ static const GDebugKey gdk_debug_keys[]
   {"events",     GDK_DEBUG_EVENTS},
   {"misc",     GDK_DEBUG_MISC},
   {"dnd",     GDK_DEBUG_DND},
-  {"color-context", GDK_DEBUG_COLOR_CONTEXT},
   {"xim",     GDK_DEBUG_XIM}
 };

Index: gdk/gdkinternals.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkinternals.h,v
retrieving revision 1.9
diff -u -3 -p -u -r1.9 gdkinternals.h
--- gdk/gdkinternals.h 2001/07/05 13:41:33 1.9
+++ gdk/gdkinternals.h 2001/08/13 10:23:59
@@ -42,8 +42,7 @@ typedef enum {
   GDK_DEBUG_MISC          = 1 << 0,
   GDK_DEBUG_EVENTS        = 1 << 1,
   GDK_DEBUG_DND           = 1 << 2,
-  GDK_DEBUG_COLOR_CONTEXT = 1 << 3,
-  GDK_DEBUG_XIM           = 1 << 4
+  GDK_DEBUG_XIM           = 1 << 3
 } GdkDebugFlag;

 extern gint   gdk_debug_level;
Index: gdk/x11/gdkmain-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkmain-x11.c,v
retrieving revision 1.133
diff -u -3 -p -u -r1.133 gdkmain-x11.c
--- gdk/x11/gdkmain-x11.c 2001/07/18 04:31:09 1.133
+++ gdk/x11/gdkmain-x11.c 2001/08/13 10:23:59
@@ -95,7 +95,6 @@ static const GDebugKey gdk_debug_keys[]
   {"events",     GDK_DEBUG_EVENTS},
   {"misc",     GDK_DEBUG_MISC},
   {"dnd",     GDK_DEBUG_DND},
-  {"color-context", GDK_DEBUG_COLOR_CONTEXT},
   {"xim",     GDK_DEBUG_XIM}
 };

Index: gtk/gtkdebug.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkdebug.h,v
retrieving revision 1.17
diff -u -3 -p -u -r1.17 gtkdebug.h
--- gtk/gtkdebug.h 2001/02/04 07:05:28 1.17
+++ gtk/gtkdebug.h 2001/08/13 10:23:59
@@ -33,11 +33,10 @@ extern "C" {

 typedef enum {
   GTK_DEBUG_MISC       = 1 << 0,
-  GTK_DEBUG_DND        = 1 << 1,
-  GTK_DEBUG_PLUGSOCKET = 1 << 2,
-  GTK_DEBUG_TEXT       = 1 << 3,
-  GTK_DEBUG_TREE       = 1 << 4,
-  GTK_DEBUG_UPDATES    = 1 << 5
+  GTK_DEBUG_PLUGSOCKET = 1 << 1,
+  GTK_DEBUG_TEXT       = 1 << 2,
+  GTK_DEBUG_TREE       = 1 << 3,
+  GTK_DEBUG_UPDATES    = 1 << 4
 } GtkDebugFlag;

 #ifdef G_ENABLE_DEBUG
Index: gtk/gtkmain.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v
retrieving revision 1.170
diff -u -3 -p -u -r1.170 gtkmain.c
--- gtk/gtkmain.c 2001/07/18 23:39:22 1.170
+++ gtk/gtkmain.c 2001/08/13 10:23:59
@@ -144,7 +144,6 @@ guint gtk_debug_flags = 0;     /* Global
 #ifdef G_ENABLE_DEBUG
 static const GDebugKey gtk_debug_keys[] = {
   {"misc", GTK_DEBUG_MISC},
-  {"dnd", GTK_DEBUG_DND},
   {"plugsocket", GTK_DEBUG_PLUGSOCKET},
   {"text", GTK_DEBUG_TEXT},
   {"tree", GTK_DEBUG_TREE},