gtk+ r20981 - in trunk: . gdk

[mitch svn gnome org]

Author: mitch
Date: Mon Aug  4 17:17:46 2008
New Revision: 20981
URL: http://svn.gnome.org/viewvc/gtk+?rev=20981&view=rev

Log:
2008-08-04  Michael Natterer  <mitch imendio com>

	* gdk/gdk.c (gdk_parse_args): call gdk_rgb_set_verbose(TRUE) if
	"gdkrgb" is in the debug flags.

	* gdk/gdkrgb.c (gdk_rgb_init): remove setting the verbose flag
	here, this function is deprecated and the debug flag didn't work
	when using GDK properly.



Modified:
   trunk/ChangeLog
   trunk/gdk/gdk.c
   trunk/gdk/gdkrgb.c

Modified: trunk/gdk/gdk.c
==============================================================================
--- trunk/gdk/gdk.c	(original)
+++ trunk/gdk/gdk.c	Mon Aug  4 17:17:46 2008
@@ -233,7 +233,10 @@
       g_error_free (error);
     }
   g_option_context_free (option_context);
-  
+
+  if (_gdk_debug_flags && GDK_DEBUG_GDKRGB)
+    gdk_rgb_set_verbose (TRUE);
+
   GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }
 

Modified: trunk/gdk/gdkrgb.c
==============================================================================
--- trunk/gdk/gdkrgb.c	(original)
+++ trunk/gdk/gdkrgb.c	Mon Aug  4 17:17:46 2008
@@ -36,7 +36,6 @@
 
 #define ENABLE_GRAYSCALE
 
-#include "gdkprivate.h"
 #include "gdkinternals.h"	/* _gdk_windowing_get_bits_for_depth() */
 
 #include "gdkrgb.h"
@@ -678,9 +677,6 @@
 {
   static const gint byte_order[1] = { 1 };
 
-  if (_gdk_debug_flags & GDK_DEBUG_GDKRGB)
-    gdk_rgb_verbose = TRUE;
-
   /* check endian sanity */
 #if G_BYTE_ORDER == G_BIG_ENDIAN
   if (((char *)byte_order)[0] == 1)