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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-30 10:22:07 +0300 (Thu, 30 Apr 2009)
New Revision: 18196

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
Log:
disable fix for NB#101437 - it requires widget changes first


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 07:16:59 UTC (rev 18195)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 07:22:07 UTC (rev 18196)
@@ -5,6 +5,9 @@
 	mb_wm_managed_client_from_xwindow to shut up Coverity.
 	* matchbox/theme-engines/mb-wm-theme.c (mb_wm_theme_new): Remove code
 	marked with FIXME since the theme package seems to be OK now.
+	* matchbox/client-types/mb-wm-client-menu.c (mb_wm_client_menu_init):
+	Comment out Thomas' fix for NB#101437 -- it requires toolkit changes
+	before it works.
 
 2009-04-29  Marc Ordinas i Llopis  <marc.ordinasillopis at collabora.co.uk>
 

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-04-30 07:16:59 UTC (rev 18195)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-04-30 07:22:07 UTC (rev 18196)
@@ -110,7 +110,10 @@
   }
   else
   {
+#if 0  /* FIXME Return this code when Gtk+ sets the legacy menu to different
+          type than the CSM pop-up menu */
     if (win->net_type != wm->atoms[MBWM_ATOM_NET_WM_WINDOW_TYPE_POPUP_MENU])
+#endif
       {
 	if (geom.x < 112 * 2)
 	  /* TODO: this should be dynamic, depending on status area.