[meego-commits] 24499: Changes to MeeGo:1.2:oss/mutter

[danming]

Hi,
I have made the following changes to mutter in project MeeGo:1.2:oss. Please review and accept ASAP.

Thank You,
danming

[This message was auto-generated]

---

Request #24499:

  submit:   home:danming:branches:MeeGo:1.2:oss/mutter(r6)(noupdate) -> MeeGo:1.2:oss/mutter


Message:
    Tolerate XError to avoid aborting X

State:   new          2011-11-09T23:31:59 danming
Comment: None



changes files:
--------------
--- mutter.changes
+++ mutter.changes
@@ -0,0 +1,3 @@
+* Thu Nov 10 2011 Danming Xie <danming.xie at intel.com> - 2.31.5_1.1
+- Tolerate XError to avoid aborting X.
+

new:
----
  0001-Tolerate-XError-to-avoid-aborting-X.patch

spec files:
-----------
--- mutter.spec
+++ mutter.spec
@@ -14,6 +14,7 @@
 URL:        http://www.meego.com
 Source0:    mutter-%{version}.tar.bz2
 Source100:  mutter.yaml
+Patch0:     0001-Tolerate-XError-to-avoid-aborting-X.patch
 Requires:   startup-notification
 Requires:   GConf2
 Requires:   dbus-x11
@@ -66,7 +67,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ 0001-Tolerate-XError-to-avoid-aborting-X.patch (new)
--- 0001-Tolerate-XError-to-avoid-aborting-X.patch
+++ 0001-Tolerate-XError-to-avoid-aborting-X.patch
+From 4de71b73696acec3d563a4f9f19ffc9ca030fff3 Mon Sep 17 00:00:00 2001
+From: Danming Xie <danming.xie at intel.com>
+Date: Wed, 9 Nov 2011 23:22:52 -0500
+Subject: [PATCH] Tolerate XError to avoid aborting X.
+
+When driver reports wrong damage and window information to X,
+mutter tolerate the error and go on running.
+
+Signed-off-by: Danming Xie <danming.xie at intel.com>
+---
+ src/core/errors.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/core/errors.c b/src/core/errors.c
+index 7b72bf2..42633f0 100644
+--- a/src/core/errors.c
++++ b/src/core/errors.c
+@@ -208,7 +208,7 @@ x_error_handler (Display     *xdisplay,
+     }
+   else
+     {
+-      meta_bug ("Unexpected X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
++      meta_warning ("Unexpected X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
+                 buf,
+                 error->serial, 
+                 error->error_code, 
+-- 
+1.7.2.2
+