From 6a9242b192e3894fae9c397c1d383711cf8e36c6 Mon Sep 17 00:00:00 2001
From: Kang Jeong-Hee <kz@src.gnome.org>
Date: Wed, 14 Dec 2005 12:47:35 +0000
Subject: [PATCH] compile with compositor enabled

---
 ChangeLog        |  8 ++++++++
 src/compositor.c | 20 ++++++++++----------
 src/delete.c     |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d9cbfabd..50c77e258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-13  Kang Jeong-Hee  <Keizi@mail.co.kr>
+
+	* src/compositor.c: replace old call to width and height
+	of MetaScreen struct with rect.width and rect.height.
+	Now compile ok.
+	* src/delete.c: make an int variable into unsigned int.
+	Now compile warning has gone.
+
 2005-12-12  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.13.8
diff --git a/src/compositor.c b/src/compositor.c
index d82fadbff..27de16b74 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -336,8 +336,8 @@ paint_screen (MetaCompositor *compositor,
 
       r.x = 0;
       r.y = 0;
-      r.width = screen->width;
-      r.height = screen->height;
+      r.width = screen->rect.width;
+      r.height = screen->rect.height;
       
       region = XFixesCreateRegion (xdisplay, &r, 1);
     }
@@ -351,8 +351,8 @@ paint_screen (MetaCompositor *compositor,
     }
 
   buffer_pixmap = XCreatePixmap (xdisplay, screen->xroot,
-                                 screen->width,
-                                 screen->height,
+                                 screen->rect.width,
+                                 screen->rect.height,
                                  DefaultDepth (xdisplay,
                                                screen->number));
 
@@ -360,7 +360,7 @@ paint_screen (MetaCompositor *compositor,
   XSetForeground (xdisplay, gc, WhitePixel (xdisplay, screen->number));
   XFixesSetGCClipRegion (xdisplay, gc, 0, 0, region);
   XFillRectangle (xdisplay, buffer_pixmap, gc, 0, 0,
-                  screen->width, screen->height);
+                  screen->rect.width, screen->rect.height);
   
   format = XRenderFindVisualFormat (xdisplay,
                                     DefaultVisual (xdisplay,
@@ -473,7 +473,7 @@ paint_screen (MetaCompositor *compositor,
   XRenderComposite (xdisplay, PictOpSrc, buffer_picture, None,
                     screen->root_picture,
                     0, 0, 0, 0, 0, 0,
-                    screen->width, screen->height);
+                    screen->rect.width, screen->rect.height);
   
   XFixesDestroyRegion (xdisplay, region);
   XFreePixmap (xdisplay, buffer_pixmap);
@@ -782,8 +782,8 @@ process_expose (MetaCompositor     *compositor,
 
   r.x = 0;
   r.y = 0;
-  r.width = screen->width;
-  r.height = screen->height;
+  r.width = screen->rect.width;
+  r.height = screen->rect.height;
   region = XFixesCreateRegion (compositor->display->xdisplay, &r, 1);
   
   merge_and_destroy_damage_region (compositor, screen, region);
@@ -1288,8 +1288,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   /* Damage the whole screen */
   r.x = 0;
   r.y = 0;
-  r.width = screen->width;
-  r.height = screen->height;
+  r.width = screen->rect.width;
+  r.height = screen->rect.height;
 
   merge_and_destroy_damage_region (compositor,
                                    screen,
diff --git a/src/delete.c b/src/delete.c
index caaf90573..3cbf78d07 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -248,7 +248,7 @@ io_from_ping_dialog (GIOChannel   *channel,
   if (condition & G_IO_IN)
     {
       char *str;
-      int len;
+      unsigned int len;
       GError *err;
 
       /* Go ahead and block for all data from child */