[maemo-commits] [maemo-commits] r15850 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-08-07 17:38:48 +0300 (Thu, 07 Aug 2008)
New Revision: 15850

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkmain-x11.c
Log:
2008-08-07 16:24:01  Tim Janik  <timj at imendio.com>

        * gdk/x11/gdkmain-x11.c (gdk_x_error): abort the program with g_error()
        instead of exit(1) in case of X errors, so testers have core dumps and
        logging information about abnormal program abortion available, fixes:
        NB#75037 - When receiving an X error, GDK exits with 1 which makes debugging hard



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-08-07 10:53:21 UTC (rev 15849)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-08-07 14:38:48 UTC (rev 15850)
@@ -1,3 +1,10 @@
+2008-08-07 16:24:01  Tim Janik  <timj at imendio.com>
+
+	* gdk/x11/gdkmain-x11.c (gdk_x_error): abort the program with g_error()
+	instead of exit(1) in case of X errors, so testers have core dumps and
+	logging information about abnormal program abortion available, fixes:
+	NB#75037 - When receiving an X error, GDK exits with 1 which makes debugging hard
+
 2008-08-06  Michael Natterer  <mitch at imendio.com>
 
 	Merged from upstream trunk:

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkmain-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkmain-x11.c	2008-08-07 10:53:21 UTC (rev 15849)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkmain-x11.c	2008-08-07 14:38:48 UTC (rev 15850)
@@ -637,7 +637,7 @@
                              error->request_code,
                              error->minor_code);
           
-#ifdef G_ENABLE_DEBUG	  
+#if     defined (G_ENABLE_DEBUG) || defined (MAEMO_CHANGES)
 	  g_error ("%s", msg);
 #else /* !G_ENABLE_DEBUG */
 	  g_fprintf (stderr, "%s\n", msg);