[maemo-commits] [maemo-commits] r17305 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-28 13:30:06 +0200 (Wed, 28 Jan 2009)
New Revision: 17305

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-mem.c
Log:
releasing


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2009-01-28 08:34:33 UTC (rev 17304)
+++ projects/haf/trunk/libosso/debian/changelog	2009-01-28 11:30:06 UTC (rev 17305)
@@ -1,4 +1,4 @@
-libosso (2.17-1~unreleased) unstable; urgency=low
+libosso (2.17-1) unstable; urgency=low
 
   Armin Burgmeier  <armin at openismus.com>:
 
@@ -33,7 +33,12 @@
   Kimmo:
         * Listen to DSME instead of MCE for shutdown and save unsaved data
           signals.
+        * Fixes: NB#94762 (recompilation bug)
 
+  Leonid:
+        * Remove syslog() call from osso_mem_saw_enable() to avoid a mutex
+          deadlock. Fixes: NB#91854
+
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 28 Jan 2009 09:53:48 +0200
 
 libosso (2.16-1) unstable; urgency=low

Modified: projects/haf/trunk/libosso/src/osso-mem.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-mem.c	2009-01-28 08:34:33 UTC (rev 17304)
+++ projects/haf/trunk/libosso/src/osso-mem.c	2009-01-28 11:30:06 UTC (rev 17305)
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <pthread.h>
 #include <string.h>
-#include <syslog.h>
 #include <inttypes.h>
 
 #include "osso-mem.h"
@@ -488,11 +487,6 @@
       saw_max_heap_size  = mi.arena + mi.hblkhd + current.usable - threshold;
       saw_max_block_size = watchblock;
       saw_user_context   = context;
-      /* Always dumping memory information (workaround for thumbnailer) */
-      syslog(LOG_CRIT, "osso_mem %zd = %u + %u + %zd - %zd",
-	     saw_max_heap_size, mi.arena, mi.hblkhd, current.usable, 
-	     threshold);
-
       if(saw_malloc_hook != __malloc_hook)
       {
          /* SAW hook is not set */