Index: libwnck/ChangeLog
===================================================================
RCS file: /export/cvs/gnome-2.0/libwnck/ChangeLog,v
retrieving revision 1.189
diff -p -u -5 -r1.189 ChangeLog
--- libwnck/ChangeLog	2003/03/28 07:11:05	1.189
+++ libwnck/ChangeLog	2003/03/29 07:28:34
@@ -1,5 +1,11 @@
+2003-03-29  Arvind Samptur <arvind.samptur@wipro.com>
+	* pager.c: (get_window_rect): Get the width and height of the 
+	screen where the pager is added.
+
+	* xutils.c: (get_cmap): Get the colormap on the screen the pager exists.
+
 2003-03-28  Fatih Demir <kabalak@gtranslator.org>
 
 	* configure.in: Added "ta" (Tamil) to the languages' list ALL_LINGUAS.
 
 2003-03-26  Havoc Pennington  <hp@pobox.com>
Index: libwnck/libwnck/pager.c
===================================================================
RCS file: /export/cvs/gnome-2.0/libwnck/libwnck/pager.c,v
retrieving revision 1.32
diff -p -u -5 -r1.32 pager.c
--- libwnck/libwnck/pager.c	2003/03/13 04:21:05	1.32
+++ libwnck/libwnck/pager.c	2003/03/29 07:28:35
@@ -24,10 +24,11 @@
 #include "window.h"
 #include "window-action-menu.h"
 #include "xutils.h"
 #include "pager-accessible-factory.h"
 #include "workspace-accessible-factory.h"
+#include "private.h"
 
 
 #define N_SCREEN_CONNECTIONS 10
 
 struct _WnckPagerPrivate
@@ -552,12 +553,17 @@ get_window_rect (WnckWindow         *win
                  GdkRectangle       *rect)
 {
   double width_ratio, height_ratio;
   int x, y, width, height;
   
-  width_ratio = (double) workspace_rect->width / (double) gdk_screen_width ();
-  height_ratio = (double) workspace_rect->height / (double) gdk_screen_height ();
+  width_ratio = (double) workspace_rect->width / (double) gdk_screen_get_width (
+                                                                         _wnck_screen_get_gdk_screen (
+                                                                          wnck_window_get_screen(window)));
+
+  height_ratio = (double) workspace_rect->height / (double) gdk_screen_get_height (
+                                                                         _wnck_screen_get_gdk_screen (
+                                                                          wnck_window_get_screen(window)));
   
   wnck_window_get_geometry (window, &x, &y, &width, &height);
   
   x *= width_ratio;
   y *= height_ratio;
Index: libwnck/libwnck/xutils.c
===================================================================
RCS file: /export/cvs/gnome-2.0/libwnck/libwnck/xutils.c,v
retrieving revision 1.39
diff -p -u -5 -r1.39 xutils.c
--- libwnck/libwnck/xutils.c	2003/01/23 02:11:30	1.39
+++ libwnck/libwnck/xutils.c	2003/03/29 07:28:35
@@ -1550,11 +1550,12 @@ get_cmap (GdkPixmap *pixmap)
           cmap = NULL;
         }
       else
         {
           /* Try system cmap */
-          cmap = gdk_colormap_get_system ();
+          cmap = gdk_screen_get_system_colormap (
+                                          gdk_drawable_get_screen (GDK_DRAWABLE (pixmap)));
           g_object_ref (G_OBJECT (cmap));
         }
     }
 
   /* Be sure we aren't going to blow up due to visual mismatch */
