[fusion-commits] compiz mirror: Changes to 'master' (66d0df7a5d8cf93cf129ed1f1f13ac3ba2e6579b)

[compiz at server.beryl-project.org]

New commits:
commit 66d0df7a5d8cf93cf129ed1f1f13ac3ba2e6579b
Author: David Reveman <davidr at novell.com>
Date:   Fri Jul 27 17:04:15 2007 -0400

    Fix type of path argument.

commit db910a18fb0fab10e08398c904de2f4f4a4e8985
Author: David Reveman <davidr at novell.com>
Date:   Fri Jul 27 17:03:47 2007 -0400

    Fix type of name argument.

commit 3cc932c2518be2d8b05f9b7ee7b0401d3113291c
Author: David Reveman <davidr at novell.com>
Date:   Fri Jul 27 16:46:21 2007 -0400

    Make sure we damage screen correctly when done resizing.


 include/decoration.h               |   10 +++++-----
 kde/window-decorator/decorator.cpp |    2 +-
 kde/window-decorator/decorator.h   |    2 +-
 libdecoration/decoration.c         |   10 +++++-----
 plugins/resize.c                   |   15 +++++++++++----
 5 files changed, 23 insertions(+), 16 deletions(-)


Modified: compiz/include/decoration.h
===================================================================
--- compiz/include/decoration.h
+++ compiz/include/decoration.h
@@ -389,11 +389,11 @@ decor_blend_right_border_picture (Display	  *xdisplay,
 #define DECOR_ACQUIRE_STATUS_OTHER_DM_RUNNING 2
 
 int
-decor_acquire_dm_session (Display *xdisplay,
-			  int	   screen,
-			  char     *name,
-			  int	   replace_current_dm,
-			  Time	   *timestamp);
+decor_acquire_dm_session (Display    *xdisplay,
+			  int	     screen,
+			  const char *name,
+			  int	     replace_current_dm,
+			  Time	     *timestamp);
 
 void
 decor_set_dm_check_hint (Display *xdisplay,

Modified: compiz/kde/window-decorator/decorator.cpp
===================================================================
--- compiz/kde/window-decorator/decorator.cpp
+++ compiz/kde/window-decorator/decorator.cpp
@@ -357,7 +357,7 @@ KWD::Decorator::updateDefaultShadow (KWD::Window *w)
 }
 
 DBusMessage *
-KWD::Decorator::sendAndBlockForShadowOptionReply (char *path)
+KWD::Decorator::sendAndBlockForShadowOptionReply (const char *path)
 {
     DBusMessage *message;
 

Modified: compiz/kde/window-decorator/decorator.h
===================================================================
--- compiz/kde/window-decorator/decorator.h
+++ compiz/kde/window-decorator/decorator.h
@@ -136,7 +136,7 @@ class Decorator:public KApplication, public KWinInterface {
 	void reconfigure (void);
 
     private:
-	DBusMessage *sendAndBlockForShadowOptionReply (char *path);
+	DBusMessage *sendAndBlockForShadowOptionReply (const char *path);
 	WId fetchFrame (WId window);
 	void updateShadow (void);
 	void updateAllShadowOptions (void);

Modified: compiz/libdecoration/decoration.c
===================================================================
--- compiz/libdecoration/decoration.c
+++ compiz/libdecoration/decoration.c
@@ -2537,11 +2537,11 @@ decor_blend_right_border_picture (Display	  *xdisplay,
 }
 
 int
-decor_acquire_dm_session (Display *xdisplay,
-			  int	   screen,
-			  char     *name,
-			  int	   replace_current_dm,
-			  Time	   *timestamp)
+decor_acquire_dm_session (Display    *xdisplay,
+			  int	     screen,
+			  const char *name,
+			  int	     replace_current_dm,
+			  Time	     *timestamp)
 {
     XEvent		 event;
     XSetWindowAttributes attr;

Modified: compiz/plugins/resize.c
===================================================================
--- compiz/plugins/resize.c
+++ compiz/plugins/resize.c
@@ -506,7 +506,14 @@ resizeTerminate (CompDisplay	 *d,
 	}
 	else
 	{
+	    XRectangle geometry;
+
 	    if (state & CompActionStateCancel)
+		geometry = rd->savedGeometry;
+	    else
+		geometry = rd->geometry;
+
+	    if (memcmp (&geometry, &rd->savedGeometry, sizeof (geometry)) == 0)
 	    {
 		BoxRec box;
 
@@ -519,10 +526,10 @@ resizeTerminate (CompDisplay	 *d,
 	    }
 	    else
 	    {
-		xwc.x      = rd->geometry.x;
-		xwc.y      = rd->geometry.y;
-		xwc.width  = rd->geometry.width;
-		xwc.height = rd->geometry.height;
+		xwc.x      = geometry.x;
+		xwc.y      = geometry.y;
+		xwc.width  = geometry.width;
+		xwc.height = geometry.height;
 
 		mask = CWX | CWY | CWWidth | CWHeight;
 	    }