Index: libwnck/tasklist.c
===================================================================
RCS file: /cvs/gnome/libwnck/libwnck/tasklist.c,v
retrieving revision 1.61
diff -u -u -8 -p -r1.61 tasklist.c
--- libwnck/tasklist.c	21 Sep 2004 14:51:11 -0000	1.61
+++ libwnck/tasklist.c	28 Oct 2004 19:05:52 -0000
@@ -1456,17 +1456,17 @@ static gboolean
 wnck_tasklist_include_window (WnckTasklist *tasklist, WnckWindow *win)
 {
   WnckWorkspace *active_workspace;
   int x, y, w, h;
 
   if (wnck_window_get_state (win) & WNCK_WINDOW_STATE_SKIP_TASKLIST)
     return FALSE;
 
-  if (tasklist->priv->monitor_num != -1)
+  if (0 /* bug 154040 */ && tasklist->priv->monitor_num != -1)
     {
       wnck_window_get_geometry (win, &x, &y, &w, &h);
       /* Don't include the window if its center point is not on the same monitor */
       if (gdk_screen_get_monitor_at_point (_wnck_screen_get_gdk_screen (tasklist->priv->screen),
                                            x + w / 2, y + h / 2) != tasklist->priv->monitor_num)
         return FALSE;
     }
 
@@ -1499,17 +1499,17 @@ wnck_tasklist_update_lists (WnckTasklist
   WnckTask *win_task;
   WnckTask *class_group_task;
   gint monitor_num;
 
   wnck_tasklist_free_tasks (tasklist);
   
   windows = wnck_screen_get_windows (tasklist->priv->screen);
   
-  if (GTK_WIDGET (tasklist)->window != NULL)
+  if (0 /* bug 154040 */ && GTK_WIDGET (tasklist)->window != NULL)
     {
       monitor_num = gdk_screen_get_monitor_at_window (_wnck_screen_get_gdk_screen (tasklist->priv->screen),
                                                       GTK_WIDGET (tasklist)->window);
       if (monitor_num != tasklist->priv->monitor_num)
         {
           tasklist->priv->monitor_num = monitor_num;
           gdk_screen_get_monitor_geometry (_wnck_screen_get_gdk_screen (tasklist->priv->screen),
                                            tasklist->priv->monitor_num,
@@ -1756,17 +1756,18 @@ wnck_tasklist_window_changed_geometry (W
     return;
 
   /*
    * If the (parent of the) tasklist itself skips
    * the tasklist, we need an extra check whether
    * the tasklist itself possibly changed monitor.
    */
   monitor_changed = FALSE;
-  if (wnck_window_get_state (window) & WNCK_WINDOW_STATE_SKIP_TASKLIST &&
+  if (0 /* bug 154040 */ && 
+      wnck_window_get_state (window) & WNCK_WINDOW_STATE_SKIP_TASKLIST &&
       GTK_WIDGET (tasklist)->window != NULL)
     {
       /* Do the extra check only if there is a suspect of a monitor change (= this window is off monitor) */
       wnck_window_get_geometry (window, &x, &y, &w, &h);
       if (!POINT_IN_RECT (x + w / 2, y + h / 2, tasklist->priv->monitor_geometry))
         {
           monitor_changed = (gdk_screen_get_monitor_at_window (_wnck_screen_get_gdk_screen (tasklist->priv->screen),
                                                      GTK_WIDGET (tasklist)->window) != tasklist->priv->monitor_num);