Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.340
diff -p -u -r1.340 window.c
--- src/window.c	15 Aug 2004 17:32:45 -0000	1.340
+++ src/window.c	16 Aug 2004 02:28:47 -0000
@@ -1621,6 +1621,24 @@ window_takes_focus_on_map (MetaWindow *w
     case META_WINDOW_NORMAL:
     case META_WINDOW_DIALOG:
     case META_WINDOW_MODAL_DIALOG:
+      /* This is officially known as, "a hack that hides bugs."  :-)
+       * Avoid focus stealing stuff on non-first windows of certain
+       * applications.
+       */
+      if (window->net_wm_user_time_set)
+        {
+          if ((strcmp  (window->res_class, "Gnome-terminal") == 0) ||
+              (strcmp  (window->res_class, "Mozilla-bin")    == 0) ||
+              (strcmp  (window->res_class, "Nautilus")       == 0) ||
+              (strcmp  (window->res_class, "Gnome-panel")    == 0) ||
+              (strncmp (window->res_class, "Evolution", 9)   == 0) ||
+              (strcmp  (window->res_class, "Epiphany")       == 0) ||
+              (strcmp  (window->res_class, "Wnck-applet")    == 0))
+            {
+              return TRUE;
+            }
+        }
+
       meta_topic (META_DEBUG_STARTUP,
                   "COMPARISON:\n"
                   "  net_wm_user_time_set : %d\n"
