rpms/galeon/devel galeon-2.0.7-bug418439.patch, NONE, 1.1 galeon-1.3.2-home.patch, 1.1, 1.2 galeon.spec, 1.74, 1.75

[Yanko Kaneti]

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30413

Modified Files:
	galeon-1.3.2-home.patch galeon.spec 
Added Files:
	galeon-2.0.7-bug418439.patch 
Log Message:
- Avoid crashing (#577604), gnome bug 418439
- http://start.fedoraproject.org/ as default homepage


galeon-2.0.7-bug418439.patch:
 EventContext.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE galeon-2.0.7-bug418439.patch ---
diff --git a/mozilla/EventContext.cpp b/mozilla/EventContext.cpp
index a2a0556..7b22394 100644
--- a/mozilla/EventContext.cpp
+++ b/mozilla/EventContext.cpp
@@ -492,12 +492,12 @@ nsresult EventContext::GetCSSBackground (nsIDOMNode *node, nsAString& url)
 	nsCOMPtr<nsIDOMCSSStyleDeclaration> decl;
 	rv = viewCSS->GetComputedStyle (element, NS_LITERAL_STRING(""),
 					    getter_AddRefs (decl));
-	if (NS_FAILED (rv)) return rv;
+	if (NS_FAILED (rv) || !decl) return rv;
 
 	nsCOMPtr<nsIDOMCSSValue> CSSValue;
-	decl->GetPropertyCSSValue (NS_LITERAL_STRING ("background-image"),
+	rv = decl->GetPropertyCSSValue (NS_LITERAL_STRING ("background-image"),
 				   getter_AddRefs (CSSValue));
-	if (!CSSValue) return NS_ERROR_FAILURE;
+	if (NS_FAILED (rv) || !CSSValue) return rv;
 
 	nsCOMPtr<nsIDOMCSSPrimitiveValue> primitiveValue = 
 		do_QueryInterface (CSSValue);

galeon-1.3.2-home.patch:
 galeon.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: galeon-1.3.2-home.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-1.3.2-home.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- galeon-1.3.2-home.patch	23 Sep 2009 07:50:27 -0000	1.1
+++ galeon-1.3.2-home.patch	29 Mar 2010 14:49:03 -0000	1.2
@@ -5,7 +5,7 @@
          <owner>galeon</owner>
          <type>string</type>
 -        <default>myportal:</default>
-+        <default>file:///usr/share/doc/HTML/index.html</default>
++        <default>http://start.fedoraproject.org/</default>
          <locale name="C">
          <short>Home page</short>
          <long>URL for the user's home page.  Displayed when Galeon starts up


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- galeon.spec	23 Mar 2010 12:29:13 -0000	1.74
+++ galeon.spec	29 Mar 2010 14:49:04 -0000	1.75
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	25%{?dist}
+Release:	26%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -21,6 +21,7 @@ Patch10:        galeon-2.0.7-moz192.patc
 Patch12:        galeon-2.0.7-nojavaconsole.patch
 Patch13:        galeon-2.0.7-spinnericon.patch
 Patch14:	galeon-2.0.7-libX11.patch
+Patch15:        galeon-2.0.7-bug418439.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -68,6 +69,7 @@ makes sense. Galeon was written to do ju
 %patch12 -p1 -b .nojavaconsole
 %patch13 -p1 -b .spinnericon
 %patch14 -p1 -b .libX11
+%patch15 -p1 -b .bug418439
 libtoolize --force
 autoreconf -f
 
@@ -144,6 +146,10 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Mar 29 2010 Yanko Kaneti <yaneti at declera.com> - 2.0.7-26
+- Avoid crashing (#577604), gnome bug 418439
+- http://start.fedoraproject.org/ as default homepage
+
 * Tue Mar 23 2010 Jan Horak <jhorak at redhat.com> - 2.0.7-25
 - Rebuild against newer gecko