rpms/xulrunner/F-12 mozilla-516124.patch, NONE, 1.1 xulrunner.spec, 1.187, 1.188

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7638

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-516124.patch 
Log Message:
Added fix for mozbz#516124

mozilla-516124.patch:
 nsAlertsIconListener.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE mozilla-516124.patch ---
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
@@ -245,23 +245,25 @@ nsAlertsIconListener::StartRequest(const
   return il->LoadImage(imageUri, nsnull, nsnull, nsnull, this,
                        nsnull, nsIRequest::LOAD_NORMAL, nsnull, nsnull,
                        getter_AddRefs(mIconRequest));
 }
 
 void
 nsAlertsIconListener::SendCallback()
 {
-  mAlertListener->Observe(NULL, "alertclickcallback", mAlertCookie.get());
+  if (mAlertListener)
+    mAlertListener->Observe(NULL, "alertclickcallback", mAlertCookie.get());
 }
 
 void
 nsAlertsIconListener::SendClosed()
 {
-  mAlertListener->Observe(NULL, "alertfinished", mAlertCookie.get());
+  if (mAlertListener)
+    mAlertListener->Observe(NULL, "alertfinished", mAlertCookie.get());
 }
 
 nsresult
 nsAlertsIconListener::InitAlertAsync(const nsAString & aImageUrl,
                                      const nsAString & aAlertTitle, 
                                      const nsAString & aAlertText,
                                      PRBool aAlertTextClickable,
                                      const nsAString & aAlertCookie,


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- xulrunner.spec	30 Mar 2010 07:11:45 -0000	1.187
+++ xulrunner.spec	10 May 2010 09:33:50 -0000	1.188
@@ -15,7 +15,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
 Patch5:         xulrunner-gtk-include.patch
 Patch6:         mozilla-libnotify.patch
+Patch7:         mozilla-516124.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
@@ -160,6 +161,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch4  -p1 -b .about-firefox-version
 %patch5  -p1 -b .gtk-include
 %patch6  -p1 -b .libnotify
+%patch7  -p1 -b .516124
 
 %patch10 -p1 -b .pk
 
@@ -479,6 +481,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 10 2010 Martin Stransky <stransky at redhat.com> - 1.9.1.9-2
+- Added fix for mozbz#516124
+
 * Tue Mar 30 2010 Jan Horak <jhorak at redhat.com> - 1.9.1.9-1
 - Update to 1.9.1.9