[Xfce4-commits] r22955 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2006-08-30 19:53:33 +0000 (Wed, 30 Aug 2006)
New Revision: 22955

Modified:
   xfwm4/trunk/src/compositor.c
   xfwm4/trunk/src/hints.h
Log:
Fix compiler warning

Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c	2006-08-30 19:41:26 UTC (rev 22954)
+++ xfwm4/trunk/src/compositor.c	2006-08-30 19:53:33 UTC (rev 22955)
@@ -925,13 +925,13 @@
      */
 
     if (!(screen_info->overlays) &&
-         (screen_info->params->show_popup_shadow && 
+         ((screen_info->params->show_popup_shadow && 
               WIN_IS_OVERRIDE(cw) && 
               !(WIN_IS_ARGB(cw) || WIN_IS_SHAPED(cw))) || 
-         (screen_info->params->show_frame_shadow &&
+          (screen_info->params->show_frame_shadow &&
               !WIN_IS_OVERRIDE(cw) && 
               !WIN_NO_SHADOW(cw) &&
-              (WIN_HAS_FRAME(cw) || !(WIN_IS_ARGB(cw) || WIN_IS_SHAPED(cw)))))
+              (WIN_HAS_FRAME(cw) || !(WIN_IS_ARGB(cw) || WIN_IS_SHAPED(cw))))))
     {
         XRectangle sr;
 

Modified: xfwm4/trunk/src/hints.h
===================================================================
--- xfwm4/trunk/src/hints.h	2006-08-30 19:41:26 UTC (rev 22954)
+++ xfwm4/trunk/src/hints.h	2006-08-30 19:53:33 UTC (rev 22955)
@@ -178,8 +178,8 @@
 gboolean getRGBIconData (DisplayInfo *, Window, unsigned long **, unsigned long *);
 gboolean getOpacity (DisplayInfo *, Window, guint *);
 gboolean getOpacityLock (DisplayInfo *, Window);
+gboolean setXAtomManagerOwner (DisplayInfo *, Atom, Window , Window);
 gboolean setAtomIdManagerOwner (DisplayInfo *, int, Window , Window);
-gboolean setXAtomManagerOwner (DisplayInfo *, Atom, Window , Window);
 
 #ifdef ENABLE_KDE_SYSTRAY_PROXY
 gboolean checkKdeSystrayWindow(DisplayInfo *, Window);