[seamonkey/f13/master] Added fix for mozbz#522635

[Martin Stransky]

commit 1fb71d4ebfeecd99fa499e555e90ee9d4059d147
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Oct 13 15:12:03 2010 +0200

    Added fix for mozbz#522635

 seamonkey-522635.patch |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
 seamonkey.spec         |    7 ++++-
 2 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/seamonkey-522635.patch b/seamonkey-522635.patch
new file mode 100644
index 0000000..cc42181
--- /dev/null
+++ b/seamonkey-522635.patch
@@ -0,0 +1,63 @@
+diff -up seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.cpp.old seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.cpp
+--- seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.cpp.old	2010-09-14 22:34:19.000000000 +0200
++++ seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.cpp	2010-10-07 16:03:02.000000000 +0200
+@@ -788,10 +788,6 @@ nsWindow::Destroy(void)
+         mWindowGroup = nsnull;
+     }
+ 
+-    // Destroy thebes surface now. Badness can happen if we destroy
+-    // the surface after its X Window.
+-    mThebesSurface = nsnull;
+-
+     if (mDragMotionTimerID) {
+         gtk_timeout_remove(mDragMotionTimerID);
+         mDragMotionTimerID = 0;
+@@ -7158,25 +7154,25 @@ nsWindow::GetThebesSurface()
+     width = PR_MIN(32767, width);
+     height = PR_MIN(32767, height);
+ 
+-    mThebesSurface = new gfxXlibSurface
++    gfxASurface* thebesSurface = new gfxXlibSurface
+         (GDK_WINDOW_XDISPLAY(d),
+          GDK_WINDOW_XWINDOW(d),
+          GDK_VISUAL_XVISUAL(gdk_drawable_get_visual(d)),
+          gfxIntSize(width, height));
+ #endif
+ #ifdef MOZ_DFB
+-    mThebesSurface = new gfxDirectFBSurface(gdk_directfb_surface_lookup(d));
++    gfxASurface* thebesSurface = new gfxDirectFBSurface(gdk_directfb_surface_lookup(d));
+ #endif
+ 
+     // if the surface creation is reporting an error, then
+     // we don't have a surface to give back
+-    if (mThebesSurface && mThebesSurface->CairoStatus() != 0) {
+-        mThebesSurface = nsnull;
++    if (thebesSurface && thebesSurface->CairoStatus() != 0) {
++        thebesSurface = nsnull;
+     } else {
+-        mThebesSurface->SetDeviceOffset(gfxPoint(-x_offset, -y_offset));
++        thebesSurface->SetDeviceOffset(gfxPoint(-x_offset, -y_offset));
+     }
+ 
+-    return mThebesSurface;
++    return thebesSurface;
+ }
+ 
+ NS_IMETHODIMP
+diff -up seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.h.old seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.h
+--- seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.h.old	2010-09-14 22:34:19.000000000 +0200
++++ seamonkey-2.0.8/comm-1.9.1/mozilla/widget/src/gtk2/nsWindow.h	2010-10-07 16:02:18.000000000 +0200
+@@ -510,8 +510,6 @@ private:
+     PRInt32             mTransparencyBitmapWidth;
+     PRInt32             mTransparencyBitmapHeight;
+ 
+-    nsRefPtr<gfxASurface> mThebesSurface;
+-
+ #ifdef MOZ_DFB
+     int                    mDFBCursorX;
+     int                    mDFBCursorY;
+@@ -612,4 +610,3 @@ public:
+ };
+ 
+ #endif /* __nsWindow_h__ */
+-
diff --git a/seamonkey.spec b/seamonkey.spec
index d6597f9..a6c2380 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -16,7 +16,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -37,6 +37,7 @@ Source100:      find-external-requires
 
 Patch0:         mozilla-jemalloc.patch
 Patch1:         mozilla-191-path.patch
+Patch2:         seamonkey-522635.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -95,6 +96,7 @@ cd %{sources_subdir}
 
 %patch0 -p0 -b .jemalloc
 %patch1 -p0 -b .path
+%patch2 -p2 -b .522635
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -345,6 +347,9 @@ update-desktop-database %{_datadir}/applications
 
 
 %changelog
+* Wed Oct 13 2010 Martin Stransky <stransky at redhat.com> 2.0.8-2
+- Added fix for mozbz#522635
+
 * Wed Sep 22 2010 Martin Stransky <stransky at redhat.com> 2.0.8-1
 - Update to 2.0.8