17999N/A--- metacity-2.28.0/src/core/bell.c 2009-09-09 04:55:35.000000000 +0800

17999N/A+++ /backup/jtan/bell.c 2009-12-23 17:18:47.623372430 +0800

17999N/A@@ -310,15 +310,20 @@

17999N/A

17999N/A ca_proplist_destroy (p);

17999N/A

17999N/A- if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)

17999N/A- {

17999N/A+ XkbForceBell(display->xdisplay, xkb_bell_event->percent);

17999N/A+

17999N/A+

17999N/A+ //if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)

17999N/A+ //{

17999N/A /* ...and in case that failed we use the classic X11 bell. */

17999N/A+ /*

17999N/A XkbForceDeviceBell (display->xdisplay,

17999N/A xkb_bell_event->device,

17999N/A xkb_bell_event->bell_class,

17999N/A xkb_bell_event->bell_id,

17999N/A xkb_bell_event->percent);

17999N/A- }

17999N/A+ */

17999N/A+ //}

17999N/A }

17999N/A }

17999N/A #endif /* HAVE_XKB */

18258N/Adiff -ruN metacity-2.28.1.orig/src/core/delete.c metacity-2.28.1/src/core/delete.c

18258N/A--- metacity-2.28.1.orig/src/core/delete.c 2010-02-02 06:39:27.349000933 +0000

18258N/A+++ metacity-2.28.1/src/core/delete.c 2010-02-02 06:40:26.190105767 +0000

18258N/A@@ -38,6 +38,7 @@

18258N/A #include <string.h>

18258N/A #include <stdlib.h>

18258N/A #include <stdio.h>

18258N/A+#include <sys/wait.h>

18258N/A

18258N/A static void meta_window_present_delete_dialog (MetaWindow *window,

18258N/A guint32 timestamp);