? revert.patch
? visual-bell-revert.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/metacity/ChangeLog,v
retrieving revision 1.573
diff -u -r1.573 ChangeLog
--- ChangeLog	18 Dec 2002 01:51:34 -0000	1.573
+++ ChangeLog	18 Dec 2002 15:47:50 -0000
@@ -1,3 +1,7 @@
+2002-12-17 15:36 Bill Haneman <bill.haneman@sun.com>
+	
+	Reverted 'visual-bell' patch (see bugzilla 100944).
+
 Tue Dec 17 17:50:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
 	* src/themes/AgingGorilla/metacity-theme-1.xml: added support for
@@ -11,136 +15,6 @@
 
 	* src/xprops.c (validate_or_free_results): add a comma to message #101401
 
-2002-12-16 Bill Haneman <bill.haneman@sun.com>
-   
-	* configure.in:
-	Check for XKB extension.
-
-	* src/Makefile.am: 
-	Added bell.c and bell.h to metacity sources.
-
-	* src/common.h:
-	(MetaFrameFlags):
-	Added META_FRAME_IS_FLASHING flag.
-
-	* src/frame.h:
-	(MetaFrame): Added is_flashing field.
-	
-	* src/frame.c:
-	(meta_window_ensure_frame):
-	Initialize the is_flashing flag to FALSE.
-	(meta_frame_get_flags):
-	Handle the FRAME_IS_FLASHING flag.
-	(meta_window_destroy_frame):
-	Call meta_bell_notify_frame_destroy.
-	
-	* src/prefs.h:
-	(MetaPreference):
-	Added META_PREF_VISUAL_BELL, META_PREF_AUDIBLE_BELL,
-	META_PREF_VISUAL_BELL_TYPE.
-	(MetaVisualBellType): New enum.
-	(meta_prefs_get_visual_bell, meta_prefs_bell_is_audible): 
-	(meta_prefs_get_visual_bell_type): 
-	New accessor declarations.
-	
-	* src/prefs.c:
-	(#includes): Include "display.h", since we now call
-	meta_displays_list() in our update func.
-	(#defines):
-	Define KEY_VISUAL_BELL, KEY_AUDIBLE_BELL,
-	and KEY_VISUAL_BELL_TYPE.
-	(provide_visual_bell, bell_is_audible, visual_bell_type):
-	New static state variables.	
-	(update_visual_bell): New method to update visual-bell
-	boolean settings from keys "visual_bell" and "audible_bell".
-	(update_visual_bell_type): 
-	New method to update visual-bell type setting.
-	(visual_bell_type_from_string) : 
-	New method to convert from gconf string to visual-bell
-	type enum.  Only currently recognized values are "fullscreen"
-	and "frame_flash".
-	(change_notify):
-	Handle changes to visual and audible bell properties.
-	(meta_prefs_get_visual_bell, meta_prefs_bell_is_audible): 
-	(meta_prefs_get_visual_bell_type): 
-	New accessor definitions.
-	(meta_prefs_init): Added a second call to notify_add,
-	listens to "/desktop/gnome/interface" as well as "apps/metacity".
-	Also call the update funcs for the new visual-bell gconf keys.
-	(meta_preference_to_string):
-	Handle the visual/audible bell cases.
-
-	* src/bell.h:
-	(meta_bell_notify);
-	New method, calls a visual notifucation
-	method based on the visual-bell-type, or none if the type
-	is unrecognized or invalid.
-	(meta_bell_set_audible): 
-	New public method for setting the audible bell setting,
-	used in updater for new gconf key "audible_bell".
-	(meta_bell_init):
-	Initialize the bell notification for a display.
-	(meta_bell_shutdown):
-	Shutdown the bell notification for a display.
-	(meta_bell_notify_frame_destroy):
-	Remove pending idle handlers on notification.
-
-	* src/bell.c:
-	Include "bell.h", and conditionally include <Xll/Xkblib.h>.
-	(meta_bell_set_audible):
-	If XKB is present, enable/disable the audible system 
-	bell based on the gconf key /desktop/gnome/interface/audible_bell.
-	(meta_bell_init):
-	Query and initialize XKB if present, register for notification
-	on the bell, and set audible bell according to gconf settings.
-	(meta_bell_flash_screen):
-	Maps and unmaps a fullscreen X window (painted white, then
-	black), which causes a fullscreen 'flash' transient.	
-	(meta_bell_flash_window_frame):
-	Flashes the titlebar of a specified window.
-	(meta_bell_flash_frame):
-	Calls meta_bell_flash_window_frame on the window which 
-	was the source of the current bell event, or the currently 
-	focussed window if the event source cannot be determined.
-	(meta_bell_unflash_frame):
-	Restore the frame's appearance to normal.
-	(meta_bell_flash_fullscreen):
-	Call meta_bell_flash_fullscreen for all screens.
-	(meta_bell_shutdown):
-	New method.
-	(meta_bell_notify_frame_destroy):
-	Remove pending idle handlers on notification, 
-	testing for frame->is_flashing first.
-	
-	* src/display.h:
-	(MetaDisplay): Added xkb_base_event_type field.
-	
-	* src/display.c:
-	Check for XKB and include "X11/XKBlib.h" if present.
-	(meta_display_open): Call meta_bell_init.
-	(event_callback): Call meta_bell_notify
-	when event comes from XKB and is XkbBellNotify
-	(prefs_changed_callback): 
-	Handle META_PREF_AUDIBLE_BELL notification.
-
-	* src/screen.h:
-	(MetaScreen): Add flash_window field.
-	
-	* src/screen.c:
-	(meta_screen_new):
-	Initialize flash_window field.
-
-	* src/theme.c:
-	(theme_get_style):
-	New heuristic for focus-style, to invert sense of focus
-	flag when META_FRAME_IS_FLASHING flag is set.
-	
-	* src/metacity.schemas.in:
-	Added scheme information for 
-	/apps/metacity/general/visual_bell,
-	/apps/metacity/general/audible_bell, and
-	/apps/metacity/general/visual_bell_type.
-	
 2002-12-16  Havoc Pennington  <hp@pobox.com>
 
 	* src/window-props.c (init_wm_name): argh, screwed that up. get
Index: configure.in
===================================================================
RCS file: /cvs/gnome/metacity/configure.in,v
retrieving revision 1.96
diff -u -r1.96 configure.in
--- configure.in	17 Dec 2002 01:08:27 -0000	1.96
+++ configure.in	18 Dec 2002 15:47:50 -0000
@@ -221,17 +221,6 @@
    AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
 fi
 
-found_xkb=no
-AC_CHECK_LIB(X11, XkbQueryExtension,
-               [AC_CHECK_HEADER(X11/XKBlib.h,
-                                found_xkb=yes)],
-	, $ALL_X_LIBS)
-
-if test "x$found_xkb" = "xyes"; then
-   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
-fi
-
-
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/metacity/src/Makefile.am,v
retrieving revision 1.59
diff -u -r1.59 Makefile.am
--- src/Makefile.am	17 Dec 2002 01:08:29 -0000	1.59
+++ src/Makefile.am	18 Dec 2002 15:47:50 -0000
@@ -11,8 +11,6 @@
 metacity_SOURCES= 				\
 	async-getprop.c				\
 	async-getprop.h				\
-	bell.h					\
-	bell.c					\
 	common.h				\
 	core.c					\
 	core.h					\
Index: src/common.h
===================================================================
RCS file: /cvs/gnome/metacity/src/common.h,v
retrieving revision 1.30
diff -u -r1.30 common.h
--- src/common.h	17 Dec 2002 01:08:29 -0000	1.30
+++ src/common.h	18 Dec 2002 15:47:51 -0000
@@ -42,8 +42,7 @@
   META_FRAME_MAXIMIZED                = 1 << 9,
   META_FRAME_ALLOWS_SHADE             = 1 << 10,
   META_FRAME_ALLOWS_MOVE              = 1 << 11,
-  META_FRAME_FULLSCREEN               = 1 << 12,
-  META_FRAME_IS_FLASHING              = 1 << 13
+  META_FRAME_FULLSCREEN               = 1 << 12
 } MetaFrameFlags;
 
 typedef enum
Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.170
diff -u -r1.170 display.c
--- src/display.c	17 Dec 2002 01:08:29 -0000	1.170
+++ src/display.c	18 Dec 2002 15:47:53 -0000
@@ -34,7 +34,6 @@
 #include "prefs.h"
 #include "resizepopup.h"
 #include "workspace.h"
-#include "bell.h"
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #ifdef HAVE_SOLARIS_XINERAMA
@@ -43,9 +42,6 @@
 #ifdef HAVE_XFREE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#endif
 #include <string.h>
 
 #define USE_GDK_DISPLAY
@@ -309,8 +305,6 @@
   /* we have to go ahead and do this so error handlers work */
   all_displays = g_slist_prepend (all_displays, display);
 
-  meta_bell_init (display);
-
   meta_display_init_keys (display);
 
   update_window_grab_modifiers (display);
@@ -1828,19 +1822,6 @@
       }
       break;
     default:
-#ifdef HAVE_XKB
-      if (event->type == display->xkb_base_event_type) 
-	{
-	  XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;
-	  
-	  switch (xkb_ev->xkb_type)
-	    {
-	    case XkbBellNotify:
-	      meta_bell_notify (display, xkb_ev);
-	      break;
-	    }
-	}
-#endif
       break;
     }
 
@@ -3864,10 +3845,5 @@
         }
 
       g_slist_free (windows);
-    }
-  else if (pref == META_PREF_AUDIBLE_BELL)
-    {
-      MetaDisplay *display = data;
-      meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
     }
 }
Index: src/display.h
===================================================================
RCS file: /cvs/gnome/metacity/src/display.h,v
retrieving revision 1.94
diff -u -r1.94 display.h
--- src/display.h	17 Dec 2002 01:08:29 -0000	1.94
+++ src/display.h	18 Dec 2002 15:47:54 -0000
@@ -245,9 +245,6 @@
   MetaRectangle grab_current_window_pos;
   MetaResizePopup *grab_resize_popup;
   GTimeVal    grab_last_moveresize_time;
-#ifdef HAVE_XKB
-  int         xkb_base_event_type;
-#endif
 #ifdef HAVE_XSYNC
   /* alarm monitoring client's _METACITY_UPDATE_COUNTER */
   XSyncAlarm  grab_update_alarm;
Index: src/frame.c
===================================================================
RCS file: /cvs/gnome/metacity/src/frame.c,v
retrieving revision 1.51
diff -u -r1.51 frame.c
--- src/frame.c	17 Dec 2002 01:08:29 -0000	1.51
+++ src/frame.c	18 Dec 2002 15:47:54 -0000
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "frame.h"
-#include "bell.h"
 #include "errors.h"
 #include "keybindings.h"
 
@@ -59,7 +58,6 @@
   frame->current_cursor = 0;
 
   frame->mapped = FALSE;
-  frame->is_flashing = FALSE;
   
   attrs.event_mask = EVENT_MASK;
 
@@ -161,7 +159,6 @@
 
   frame = window->frame;
   
-  meta_bell_notify_frame_destroy (frame);
   meta_ui_remove_frame (window->screen->ui, frame->xwindow);
   
   /* Unparent the client window; it may be destroyed,
@@ -257,9 +254,6 @@
 
   if (frame->window->fullscreen)
     flags |= META_FRAME_FULLSCREEN;
-
-  if (frame->is_flashing)
-    flags |= META_FRAME_IS_FLASHING;
 
   return flags;
 }
Index: src/frame.h
===================================================================
RCS file: /cvs/gnome/metacity/src/frame.h,v
retrieving revision 1.18
diff -u -r1.18 frame.h
--- src/frame.h	17 Dec 2002 01:08:29 -0000	1.18
+++ src/frame.h	18 Dec 2002 15:47:54 -0000
@@ -57,7 +57,6 @@
   int bottom_height;
 
   guint mapped : 1;
-  guint is_flashing : 1; /* used by the visual bell flash */
 };
 
 void     meta_window_ensure_frame           (MetaWindow *window);
Index: src/metacity.schemas.in
===================================================================
RCS file: /cvs/gnome/metacity/src/metacity.schemas.in,v
retrieving revision 1.21
diff -u -r1.21 metacity.schemas.in
--- src/metacity.schemas.in	17 Dec 2002 18:36:24 -0000	1.21
+++ src/metacity.schemas.in	18 Dec 2002 15:47:55 -0000
@@ -178,57 +178,6 @@
     </schema>
 
     <schema>
-      <key>/apps/metacity/visual_bell</key>
-      <applyto>/apps/metacity/general/visual_bell</applyto>      
-      <owner>metacity</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Enable Visual Bell</short>
-         <long>Turns on a visual indication when an application or the system
-	issues a 'bell' or 'beep'; useful for the hard-of-hearing and for use
-	in noisy environments, or when 'audible bell' is off.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/metacity/general/audible_bell</key>
-      <applyto>/apps/metacity/general/audible_bell</applyto>      
-      <owner>metacity</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>System Bell is Audible</short>
-         <long>Determines whether applications or the system can generate audible 
-	'beeps'; may be used in conjunction with 'visual bell' to 
-	allow silent 'beeps'.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/metacity/general/visual_bell_type</key>
-      <applyto>/apps/metacity/general/visual_bell_type</applyto>      
-      <owner>metacity</owner>
-      <type>string</type>
-      <default>fullscreen</default>
-      <locale name="C">
-         <short>Visual Bell Type</short>
-         <long>
-	Tells Metacity how to implement the visual indication that
-	the system bell or another application 'bell' indicator has
-	been rung.  Currently there are two valid values, "fullscreen",
-	which causes a fullscreen white-black flash, and "frame_flash" which
-	causes the titlebar of the application which sent the bell signal to
-	flash.  If the application which sent the bell is unknown (as is
-	usually the case for the default "system beep"), the currently
-	focused window's titlebar is flashed.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/metacity/workspace_names/name</key>
       <applyto>/apps/metacity/workspace_names/name_1</applyto>
       <applyto>/apps/metacity/workspace_names/name_2</applyto>
Index: src/prefs.c
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.c,v
retrieving revision 1.36
diff -u -r1.36 prefs.c
--- src/prefs.c	17 Dec 2002 01:08:29 -0000	1.36
+++ src/prefs.c	18 Dec 2002 15:47:56 -0000
@@ -54,10 +54,6 @@
 
 #define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
 
-#define KEY_VISUAL_BELL "/apps/metacity/general/visual_bell"
-#define KEY_AUDIBLE_BELL "/apps/metacity/general/audible_bell"
-#define KEY_VISUAL_BELL_TYPE "/apps/metacity/general/visual_bell_type"
-
 #ifdef HAVE_GCONF
 static GConfClient *default_client = NULL;
 static GList *changes = NULL;
@@ -77,9 +73,6 @@
 static gboolean disable_workarounds = FALSE;
 static gboolean auto_raise = FALSE;
 static gboolean auto_raise_delay = 500;
-static gboolean provide_visual_bell = TRUE;
-static gboolean bell_is_audible = TRUE;
-static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_INVALID;
 static MetaButtonLayout button_layout = {
   {
     META_BUTTON_FUNCTION_MENU,
@@ -105,8 +98,6 @@
 static gboolean update_mouse_button_mods  (const char *value);
 static gboolean update_focus_mode         (const char *value);
 static gboolean update_theme              (const char *value);
-static gboolean update_visual_bell        (gboolean v1, gboolean v2);
-static gboolean update_visual_bell_type   (const char *value);
 static gboolean update_num_workspaces     (int         value);
 static gboolean update_application_based  (gboolean    value);
 static gboolean update_disable_workarounds (gboolean   value);
@@ -282,7 +273,7 @@
   GError *err = NULL;
   char *str_val;
   int int_val;
-  gboolean bool_val, bool_val_2;
+  gboolean bool_val;
   
   if (default_client != NULL)
     return;
@@ -369,20 +360,6 @@
   g_free (str_val);
 #endif /* HAVE_GCONF */
   
-  bool_val = gconf_client_get_bool (default_client, KEY_VISUAL_BELL,
-                                    &err);
-  cleanup_error (&err);
-  bool_val_2 = gconf_client_get_bool (default_client, KEY_AUDIBLE_BELL,
-                                    &err);
-  cleanup_error (&err);
-  update_visual_bell (bool_val, bool_val_2);
-
-  str_val = gconf_client_get_string (default_client, KEY_VISUAL_BELL_TYPE,
-                                     &err);
-  cleanup_error (&err);
-  update_visual_bell_type (str_val);
-  g_free (str_val);
-
   /* Load keybindings prefs */
   init_bindings ();
 
@@ -398,7 +375,7 @@
                            NULL,
                            NULL,
                            &err);
-  cleanup_error (&err);  
+  cleanup_error (&err);
 #endif /* HAVE_GCONF */
 }
 
@@ -697,37 +674,6 @@
       if (update_button_layout (str))
         queue_changed (META_PREF_BUTTON_LAYOUT);
     }
-  else if (strcmp (key, KEY_VISUAL_BELL) == 0)
-    {
-      gboolean b;
-
-      b = value ? gconf_value_get_bool (value) : provide_visual_bell;      
-      if (update_visual_bell (b, bell_is_audible))
-	queue_changed (META_PREF_VISUAL_BELL);	    
-    }
-  else if (strcmp (key, KEY_AUDIBLE_BELL) == 0)
-    {
-      gboolean b;
-
-      b = value ? gconf_value_get_bool (value) : bell_is_audible;      
-      if (update_visual_bell (provide_visual_bell, b))
-	queue_changed (META_PREF_AUDIBLE_BELL);
-    }
-  else if (strcmp (key, KEY_VISUAL_BELL_TYPE) == 0)
-    {
-      const char * str;
-
-      if (value && value->type != GCONF_VALUE_STRING)
-        {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
-                        KEY_VISUAL_BELL_TYPE);
-          goto out;
-        }
-      
-      str = value ? gconf_value_get_string (value) : NULL;
-      if (update_visual_bell_type (str))
-	queue_changed (META_PREF_VISUAL_BELL_TYPE);
-    }
   else
     {
       meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
@@ -857,48 +803,8 @@
 
   return old != value;
 }
-
-static MetaVisualBellType
-visual_bell_type_from_string (const char *value)
-{
-  if (!strcmp (value, "fullscreen")) 
-    {
-      return META_VISUAL_BELL_FULLSCREEN_FLASH;
-    }
-  else if (!strcmp (value, "frame_flash"))
-    {
-      return META_VISUAL_BELL_FRAME_FLASH;
-    }
-  return META_VISUAL_BELL_FULLSCREEN_FLASH;
-}
-
-static gboolean
-update_visual_bell_type (const char *value)
-{
-  MetaVisualBellType old_bell_type;
-
-  old_bell_type = visual_bell_type;
-  visual_bell_type = visual_bell_type_from_string (value);
-
-  return (visual_bell_type != old_bell_type);
-}
 #endif /* HAVE_GCONF */
 
-static gboolean
-update_visual_bell (gboolean visual_bell, gboolean audible_bell)
-{
-  gboolean old_visual = provide_visual_bell;
-  gboolean old_audible = bell_is_audible;
-  gboolean has_changed;
-
-  provide_visual_bell = visual_bell;
-  bell_is_audible = audible_bell;
-  has_changed = (old_visual != provide_visual_bell) || 
-    (old_audible != bell_is_audible);
-
-  return has_changed;
-}
-
 #ifdef HAVE_GCONF
 static gboolean
 update_titlebar_font (const char *value)
@@ -1280,18 +1186,6 @@
     case META_PREF_WORKSPACE_NAMES:
       return "WORKSPACE_NAMES";
       break;
-
-    case META_PREF_VISUAL_BELL:
-      return "VISUAL_BELL";
-      break;
-
-    case META_PREF_AUDIBLE_BELL:
-      return "AUDIBLE_BELL";
-      break;
-
-    case META_PREF_VISUAL_BELL_TYPE:
-      return "VISUAL_BELL_TYPE";
-      break;
     }
 
   return "(unknown)";
@@ -1854,24 +1748,6 @@
 meta_prefs_get_button_layout (MetaButtonLayout *button_layout_p)
 {
   *button_layout_p = button_layout;
-}
-
-gboolean
-meta_prefs_get_visual_bell ()
-{
-  return provide_visual_bell;
-}
-
-gboolean
-meta_prefs_bell_is_audible ()
-{
-  return bell_is_audible;
-}
-
-MetaVisualBellType
-meta_prefs_get_visual_bell_type ()
-{
-  return visual_bell_type;
 }
 
 void
Index: src/prefs.h
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.h,v
retrieving revision 1.26
diff -u -r1.26 prefs.h
--- src/prefs.h	17 Dec 2002 01:08:29 -0000	1.26
+++ src/prefs.h	18 Dec 2002 15:47:57 -0000
@@ -42,10 +42,7 @@
   META_PREF_DISABLE_WORKAROUNDS,
   META_PREF_COMMANDS,
   META_PREF_BUTTON_LAYOUT,
-  META_PREF_WORKSPACE_NAMES,
-  META_PREF_VISUAL_BELL,
-  META_PREF_AUDIBLE_BELL,
-  META_PREF_VISUAL_BELL_TYPE
+  META_PREF_WORKSPACE_NAMES
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -215,18 +212,6 @@
 void meta_prefs_get_window_binding (const char          *name,
                                     unsigned int        *keysym,
                                     MetaVirtualModifier *modifiers);
-
-typedef enum
-{
-  META_VISUAL_BELL_INVALID = 0,
-  META_VISUAL_BELL_FULLSCREEN_FLASH,
-  META_VISUAL_BELL_FRAME_FLASH
-
-} MetaVisualBellType;
-
-gboolean           meta_prefs_get_visual_bell      (void);
-gboolean           meta_prefs_bell_is_audible      (void);
-MetaVisualBellType meta_prefs_get_visual_bell_type (void);
 
 #endif
 
Index: src/screen.c
===================================================================
RCS file: /cvs/gnome/metacity/src/screen.c,v
retrieving revision 1.94
diff -u -r1.94 screen.c
--- src/screen.c	17 Dec 2002 01:08:29 -0000	1.94
+++ src/screen.c	18 Dec 2002 15:47:58 -0000
@@ -523,7 +523,6 @@
   screen->current_cursor = -1; /* invalid/unset */
   screen->default_xvisual = DefaultVisualOfScreen (screen->xscreen);
   screen->default_depth = DefaultDepthOfScreen (screen->xscreen);
-  screen->flash_window = None;
 
   screen->wm_sn_selection_window = new_wm_sn_owner;
   screen->wm_sn_atom = wm_sn_atom;
Index: src/screen.h
===================================================================
RCS file: /cvs/gnome/metacity/src/screen.h,v
retrieving revision 1.42
diff -u -r1.42 screen.h
--- src/screen.h	17 Dec 2002 01:08:29 -0000	1.42
+++ src/screen.h	18 Dec 2002 15:47:58 -0000
@@ -70,8 +70,6 @@
 
   MetaCursor current_cursor;
 
-  Window flash_window;
-
   Window wm_sn_selection_window;
   Atom wm_sn_atom;
   Time wm_sn_timestamp;
Index: src/theme.c
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.c,v
retrieving revision 1.67
diff -u -r1.67 theme.c
--- src/theme.c	17 Dec 2002 01:08:29 -0000	1.67
+++ src/theme.c	18 Dec 2002 15:48:02 -0000
@@ -4760,10 +4760,8 @@
       resize = META_FRAME_RESIZE_LAST; /* compiler */
       break;
     }
-  
-  /* re invert the styles used for focus/unfocussed while flashing a frame */
-  if (((flags & META_FRAME_HAS_FOCUS) && !(flags & META_FRAME_IS_FLASHING))
-      || (!(flags & META_FRAME_HAS_FOCUS) && (flags & META_FRAME_IS_FLASHING)))
+
+  if (flags & META_FRAME_HAS_FOCUS)
     focus = META_FRAME_FOCUS_YES;
   else
     focus = META_FRAME_FOCUS_NO;
