[maemo-commits] [maemo-commits] r17862 - in projects/haf/trunk/libmatchbox2: . debian matchbox/client-types matchbox/core

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-03-30 14:28:28 +0300 (Mon, 30 Mar 2009)
New Revision: 17862

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/rules
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-util.c
Log:
	* debian/rules:
	  Recognize the "debug" DEB_BUILD_OPTIONS parameter
	  to enable g_debug() and compile with -O0.
	* matchbox/client-types/mb-wm-client-menu.c
	* matchbox/core/mb-wm-client-window.c
	* matchbox/core/mb-window-manager.c:
	  Changed printf()s to g_log()s.
	* matchbox/core/mb-wm-util.c:
	  g_debug() trapped X errors.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-30 11:28:28 UTC (rev 17862)
@@ -1,3 +1,15 @@
+2009-03-r0  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* debian/rules:
+	  Recognize the "debug" DEB_BUILD_OPTIONS parameter
+	  to enable g_debug() and compile with -O0.
+	* matchbox/client-types/mb-wm-client-menu.c
+	* matchbox/core/mb-wm-client-window.c
+	* matchbox/core/mb-window-manager.c:
+	  Changed printf()s to g_log()s.
+	* matchbox/core/mb-wm-util.c:
+	  g_debug() trapped X errors.
+
 2009-03-27  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.25

Modified: projects/haf/trunk/libmatchbox2/debian/rules
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/rules	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/debian/rules	2009-03-30 11:28:28 UTC (rev 17862)
@@ -4,7 +4,11 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-png-theme --enable-composite-managers=clutter --enable-glib-main-loop --enable-libmatchbox --disable-simple-manager --with-pango
 
-CFLAGS := -DG_DEBUG_DISABLE
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -DG_DEBUG_DISABLE
+else
+CFLAGS += -O0
+endif
 
 DEB_DH_STRIP_ARGS := --dbg-package=libmatchbox2
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-03-30 11:28:28 UTC (rev 17862)
@@ -119,7 +119,7 @@
         geom.y = 56; /* shouldn't this be taken from the theme? */
   }
 
-  printf ("%s: Menu will be at %d %d %d %d\n", __func__, geom.x, geom.y,
+  g_debug ("%s: Menu will be at %d %d %d %d", __func__, geom.x, geom.y,
            geom.width, geom.height);
 
   mb_wm_client_menu_request_geometry (client, &geom,

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-30 11:28:28 UTC (rev 17862)
@@ -151,7 +151,7 @@
   else
     {
       char * name = XGetAtomName (wm->xdpy, win->net_type);
-      printf("### unhandled window type %s (%lx) ###\n",
+      g_warning ("### unhandled window type %s (%lx) ###",
 	     name?name:"[no net_type]",
 	     win->xwindow);
       XFree (name);

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-30 11:28:28 UTC (rev 17862)
@@ -118,7 +118,7 @@
 
   if (!wm || !xwin)
     {
-      fprintf (stderr, "--- error, no wm or xwin ---\n");
+      g_critical ("--- error, no wm or xwin ---");
       return 0;
     }
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-util.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-util.c	2009-03-30 06:20:35 UTC (rev 17861)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-util.c	2009-03-30 11:28:28 UTC (rev 17862)
@@ -1,6 +1,9 @@
 #include "mb-wm.h"
 #include <stdarg.h>
 
+#undef  G_LOG_DOMAIN
+#define G_LOG_DOMAIN "libmatchbox"
+
 static int TrappedErrorCode = 0;
 static int (*old_error_handler) (Display *, XErrorEvent *);
 
@@ -9,6 +12,7 @@
 	      XErrorEvent *error)
 {
   TrappedErrorCode = error->error_code;
+  g_debug("X error %d", TrappedErrorCode);
   return 0;
 }