From 62dba86c81debf2677230c674902ddb98ba8e4c2 Mon Sep 17 00:00:00 2001
From: Owen Taylor <owt1@cornell.edu>
Date: Thu, 19 Feb 1998 18:02:03 +0000
Subject: the value of ---enable_debug is written into glibconfig.h so
 everything is

Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>

	* glib/configure.in glib/glibconfig.h.in: the value of
	---enable_debug is written into glibconfig.h so everything
	is recompiled when it changes. (HACK)

	* gtk/gtkmain.c gdk/gdk.c docs/debugging.txt:
	Added --gdk-no-debug and --gtk-no-debug switches. Effect
	of switches is no cumulative.
---
 gtk/gtkmain.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 18 deletions(-)

(limited to 'gtk/gtkmain.c')

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 90ce42cc0..3e1cd8c43 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -141,22 +141,24 @@ static GdkColormap *gtk_colormap;	   /* The colormap to be used in creating new
 					    *  widgets.
 					    */
 
-guint gtk_debug_flags;		/* Global GTK debug flag */
+guint gtk_debug_flags = 0;		   /* Global GTK debug flag */
 
 #ifdef G_ENABLE_DEBUG
 static GDebugKey gtk_debug_keys[] = {
   {"objects", GTK_DEBUG_OBJECTS}
 };
+
+static const int gtk_ndebug_keys = sizeof(gtk_debug_keys)/sizeof(GDebugKey);
+
 #endif /* G_ENABLE_DEBUG */
 
+
+
+
 void
 gtk_init (int	 *argc,
 	  char ***argv)
 {
-#ifdef G_ENABLE_DEBUG
-  gboolean debug_set = FALSE;
-#endif
-
   if (0)
     {
       g_set_error_handler (gtk_error);
@@ -171,22 +173,48 @@ gtk_init (int	 *argc,
   gdk_init (argc, argv);
   
 #ifdef G_ENABLE_DEBUG
+  {
+    gchar *debug_string = getenv("GTK_DEBUG");
+    if (debug_string != NULL)
+      gtk_debug_flags = g_parse_debug_string (debug_string,
+					      gtk_debug_keys,
+					      gtk_ndebug_keys);
+  }
+
   if (argc && argv)
     {
       gint i;
       
       for (i = 1; i < *argc;)
 	{
-	  if ((*argv[i]) && strcmp ("--gtk-debug", (*argv)[i]) == 0)
+	  if ((*argv)[i] == NULL)
+	    {
+	      i += 1;
+	      continue;
+	    }
+
+	  if (strcmp ("--gtk-debug", (*argv)[i]) == 0)
 	    {
 	      (*argv)[i] = NULL;
 
 	      if ((i + 1) < *argc && (*argv)[i + 1])
 		{
-		  gtk_debug_flags = g_parse_debug_string ((*argv)[i+1],
-							  gtk_debug_keys,
- 			          sizeof(gtk_debug_keys) / sizeof(GDebugKey));
-		  debug_set = TRUE;
+		  gtk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
+							   gtk_debug_keys,
+							   gtk_ndebug_keys);
+		  (*argv)[i + 1] = NULL;
+		  i += 1;
+		}
+	    }
+	  else if (strcmp ("--gtk-no-debug", (*argv)[i]) == 0)
+	    {
+	      (*argv)[i] = NULL;
+
+	      if ((i + 1) < *argc && (*argv)[i + 1])
+		{
+		  gtk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
+							    gtk_debug_keys,
+							    gtk_ndebug_keys);
 		  (*argv)[i + 1] = NULL;
 		  i += 1;
 		}
@@ -195,14 +223,6 @@ gtk_init (int	 *argc,
 	}
     }
 
-  if (!debug_set)
-    {
-      gchar *debug_string = getenv("GTK_DEBUG");
-      if (debug_string != NULL)
-	gtk_debug_flags = g_parse_debug_string (debug_string,
-						gtk_debug_keys,
-			        sizeof(gtk_debug_keys) / sizeof(GDebugKey));
-    }
 #endif /* G_ENABLE_DEBUG */
 
   /* Initialize the default visual and colormap to be
-- 
cgit v1.2.1