patches/metacity-09-force-system-bell.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 17507 ec8d2aa8fa24
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17248
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     1
--- metacity-2.28.0/src/core/bell.c	2009-09-09 04:55:35.000000000 +0800
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     2
+++ /backup/jtan/bell.c	2009-12-23 17:18:47.623372430 +0800
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     3
@@ -310,15 +310,20 @@
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     4
 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     5
       ca_proplist_destroy (p);
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     6
 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     7
-      if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     8
-        {      
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
     9
+      XkbForceBell(display->xdisplay, xkb_bell_event->percent);
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    10
+
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    11
+
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    12
+      //if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    13
+      //{      
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    14
           /* ...and in case that failed we use the classic X11 bell. */
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    15
+	  /*
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    16
           XkbForceDeviceBell (display->xdisplay, 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    17
                               xkb_bell_event->device, 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    18
                               xkb_bell_event->bell_class, 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    19
                               xkb_bell_event->bell_id, 
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    20
                               xkb_bell_event->percent);
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    21
-        }
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    22
+	  */
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    23
+       //}
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    24
     }
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    25
 }
f172f08fc0b8 fix bug 6885862
jerrytan
parents:
diff changeset
    26
 #endif /* HAVE_XKB */
17507
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    27
diff -ruN metacity-2.28.1.orig/src/core/delete.c metacity-2.28.1/src/core/delete.c
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    28
--- metacity-2.28.1.orig/src/core/delete.c	2010-02-02 06:39:27.349000933 +0000
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    29
+++ metacity-2.28.1/src/core/delete.c	2010-02-02 06:40:26.190105767 +0000
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    30
@@ -38,6 +38,7 @@
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    31
 #include <string.h>
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    32
 #include <stdlib.h>
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    33
 #include <stdio.h>
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    34
+#include <sys/wait.h>
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    35
 
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    36
 static void meta_window_present_delete_dialog (MetaWindow *window,
ec8d2aa8fa24 2010-02-07 Christian Kelly <[email protected]>
chrisk
parents: 17248
diff changeset
    37
                                                guint32     timestamp);