rpms/galeon/F-11 galeon-2.0.7-bug418439.patch, NONE, 1.1 galeon-1.3.2-home.patch, 1.1, 1.2 galeon.spec, 1.72, 1.73

[Yanko Kaneti]

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18907

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/F-11/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:34:18 -0000	1.1
+++ galeon-1.3.2-home.patch	30 Mar 2010 07:50:57 -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/F-11/galeon.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- galeon.spec	18 Feb 2010 10:15:48 -0000	1.72
+++ galeon.spec	30 Mar 2010 07:50:58 -0000	1.73
@@ -3,11 +3,11 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	20%{?dist}
+Release:	21%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
-Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+Source0:	http://downloads.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 #Patch0:		galeon-2.0.7-plugins.patch
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-gtkprint.patch
@@ -18,6 +18,7 @@ Patch6:		galeon-2.0.7-jsconsole.patch
 Patch7:         galeon-2.0.7-fix-str-fmt.patch
 Patch8:         galeon-1.3.2-home.patch
 Patch9:         galeon-2.0.7-dockcrash.patch
+Patch10:	galeon-2.0.7-bug418439.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -59,6 +60,7 @@ makes sense. Galeon was written to do ju
 %patch7 -p0 -b .fixfmt
 %patch8 -p1 -b .home
 %patch9 -p1 -b .dock
+%patch10 -p1 -b .bug418439
 
 
 %build
@@ -133,6 +135,10 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Mar 30 2010 Yanko Kaneti <yaneti at declera.com> - 2.0.7-21
+- Avoid crashing (#577604), gnome bug 418439
+- http://start.fedoraproject.org/ as default homepage
+
 * Thu Feb 18 2010 jhorak at redhat.com - 2.0.7-20
 - Rebuild against newer gecko