[maemo-commits] [maemo-commits] r17318 - in projects/haf/trunk/libmatchbox2: . matchbox/comp-mgr matchbox/core matchbox/theme-engines

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-29 10:04:17 +0200 (Thu, 29 Jan 2009)
New Revision: 17318

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
Log:
remove unused variables


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-29 07:52:20 UTC (rev 17317)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-29 08:04:17 UTC (rev 17318)
@@ -5,6 +5,9 @@
 	(mb_wm_client_base_stack): Handle transient chain correctly, so that
 	the whole stackable window stack is raised when one of the windows is
 	raised. Patch from Laszlo Pere.
+	* matchbox/theme-engines/mb-wm-theme-png.c,
+	matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c,
+	matchbox/core/mb-window-manager.c: Remove unused variables.
 
 2009-01-28  Gordon Williams  <gordon.williams at collabora.co.uk>
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-01-29 07:52:20 UTC (rev 17317)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-01-29 08:04:17 UTC (rev 17318)
@@ -416,12 +416,6 @@
 					MBWindowManagerClient *c);
 
 static void
-mb_wm_comp_mgr_clutter_client_transition_real (MBWMCompMgr * mgr,
-                                               MBWindowManagerClient *c1,
-                                               MBWindowManagerClient *c2,
-                                               Bool reverse);
-
-static void
 mb_wm_comp_mgr_clutter_restack_real (MBWMCompMgr *mgr);
 
 static Bool

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-01-29 07:52:20 UTC (rev 17317)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-01-29 08:04:17 UTC (rev 17318)
@@ -1153,10 +1153,8 @@
 		       Bool                   destroy)
 {
   /* FIXME: set a managed flag in client object ? */
-  MBWindowManagerClient *c;
   MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client);
   MBWMSyncType sync_flags = 0;
-  MBWindowManagerClient * next_focused;
 
   /*
    * Must not mess with stacking if the client if is of the override type
@@ -1985,8 +1983,6 @@
 
   if (mb_wm_client_focus (client))
     {
-      MBWindowManagerClient *app;
-
       if (wm->focused_client)
 	{
 	  MBWindowManagerClient *trans_old = wm->focused_client;

Modified: projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-01-29 07:52:20 UTC (rev 17317)
+++ projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-01-29 08:04:17 UTC (rev 17318)
@@ -387,8 +387,6 @@
 
       XWindowAttributes attr;
       XGetWindowAttributes( xdpy, decor->xwin, &attr );
-      XRenderPictFormat *format = XRenderFindVisualFormat( xdpy, attr.visual );
-      gboolean hasAlpha             = ( format->type == PictTypeDirect && format->direct.alphaMask );
 
       /* We can't use PictOpOver because the target window
        * doesn't have an alpha channel
@@ -400,7 +398,8 @@
 			XftDrawPicture (bdata->xftdraw_i),
 			None,
 			XftDrawPicture (ddata->xftdraw),
-			0, 0, 0, 0, button->geom.x, button->geom.y, b->width, b->height);
+			0, 0, 0, 0, button->geom.x, button->geom.y,
+                        b->width, b->height);
 
       XClearWindow (xdpy, decor->xwin);
     }