[maemo-commits] [maemo-commits] r18004 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-03 14:16:40 +0300 (Fri, 03 Apr 2009)
New Revision: 18004

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
Log:
increase ping timeout value + remove return value from client_responding handler


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-03 10:10:53 UTC (rev 18003)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-03 11:16:40 UTC (rev 18004)
@@ -1,3 +1,10 @@
+2009-04-03  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-window-manager.h: Remove unused return value from
+	the client_responding handler type.
+	* matchbox/core/mb-wm-client.c (mb_wm_client_init): According to Mox's
+	wish, increase ping timeout from 1000 to 6000 ms.
+
 2009-04-03  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_destroy):

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-04-03 10:10:53 UTC (rev 18003)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-04-03 11:16:40 UTC (rev 18004)
@@ -147,7 +147,7 @@
 
   /* These return True if now further action to be taken */
   Bool (*client_activate)   (MBWindowManager *wm, MBWindowManagerClient *c);
-  Bool (*client_responding) (MBWindowManager *wm, MBWindowManagerClient *c);
+  void (*client_responding) (MBWindowManager *wm, MBWindowManagerClient *c);
   Bool (*client_hang)       (MBWindowManager *wm, MBWindowManagerClient *c);
 
   MBWMTheme * (*theme_new)  (MBWindowManager *wm, const char * path);

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-04-03 10:10:53 UTC (rev 18003)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-04-03 11:16:40 UTC (rev 18004)
@@ -154,7 +154,7 @@
 
   client->window        = win;
   client->wmref         = wm;
-  client->ping_timeout  = 1000;
+  client->ping_timeout  = 6000;
 
   if (wm->theme)
     {