rpms/galeon/devel galeon-2.0.1-esc-ok.patch, NONE, 1.1 galeon-2.0.1-typeahead-enter.patch, NONE, 1.1 galeon-2.0.1-xul-enter.patch, NONE, 1.1 galeon.spec, 1.20, 1.21

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20006

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.1-esc-ok.patch galeon-2.0.1-typeahead-enter.patch 
	galeon-2.0.1-xul-enter.patch 
Log Message:
Added patches for bugs 203615, 203616 and 203618

galeon-2.0.1-esc-ok.patch:

--- NEW FILE galeon-2.0.1-esc-ok.patch ---
Index: galeon/mozilla/EphyPromptService.cpp
diff -u galeon/mozilla/EphyPromptService.cpp:1.1 galeon/mozilla/EphyPromptService.cpp:1.2
--- galeon/mozilla/EphyPromptService.cpp:1.1	Mon Feb 20 16:23:02 2006
+++ galeon/mozilla/EphyPromptService.cpp	Wed Mar  8 06:07:53 2006
@@ -65,7 +65,7 @@
 	RESPONSE_ABORT_SCRIPT = 42
 };
 
-#define RETVAL(r) ((r) == GTK_RESPONSE_DELETE_EVENT ? NS_ERROR_FAILURE : NS_OK)
+#define RETVAL(r) (NS_OK)
 
 class Prompter
 {

galeon-2.0.1-typeahead-enter.patch:

--- NEW FILE galeon-2.0.1-typeahead-enter.patch ---
Index: galeon/src/galeon-find-toolbar.c
diff -u galeon/src/galeon-find-toolbar.c:1.4 galeon/src/galeon-find-toolbar.c:1.5
--- galeon/src/galeon-find-toolbar.c:1.4	Mon Feb 27 16:35:10 2006
+++ galeon/src/galeon-find-toolbar.c	Sun Mar  5 07:04:35 2006
@@ -193,7 +193,12 @@
 			galeon_find_toolbar_open (toolbar, TRUE, TRUE);
 			return TRUE;
 		}
-		else if (event->keyval != GDK_space && autostart && event->length)
+		else if (autostart &&
+			 event->keyval != GDK_space && 
+			 event->keyval != GDK_KP_Enter &&
+			 event->keyval != GDK_ISO_Enter &&
+			 event->keyval != GDK_Return &&
+			 event->length)
 		{
 			GdkEvent *new_event;
 			GdkWindow *old_window;

galeon-2.0.1-xul-enter.patch:

--- NEW FILE galeon-2.0.1-xul-enter.patch ---
Index: galeon/mozilla/EventContext.cpp
diff -u galeon/mozilla/EventContext.cpp:1.47 galeon/mozilla/EventContext.cpp:1.48
--- galeon/mozilla/EventContext.cpp:1.47	Sat Jan 14 08:48:21 2006
+++ galeon/mozilla/EventContext.cpp	Sun Mar  5 07:08:23 2006
@@ -975,6 +975,9 @@
 	rv = node->GetOwnerDocument (getter_AddRefs (doc));
 	NS_ENSURE_SUCCESS (rv, retval);
 
+	nsCOMPtr<nsIDOMXULDocument> xul_document (do_QueryInterface(doc, &rv));
+	if (xul_document) return retval;
+
 	nsCOMPtr<nsIDOMNSHTMLDocument> htmlDoc (do_QueryInterface (doc));
 	if (htmlDoc)
 	{


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- galeon.spec	28 Aug 2006 14:25:09 -0000	1.20
+++ galeon.spec	29 Aug 2006 14:35:17 -0000	1.21
@@ -1,11 +1,14 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+Patch0:		galeon-2.0.1-esc-ok.patch
+Patch1:		galeon-2.0.1-typeahead-enter.patch
+Patch2:		galeon-2.0.1-xul-enter.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -34,6 +37,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
+%patch0 -p1 -b .escok
+%patch1 -p1 -b .typeahead
+%patch2 -p1 -b .xulenter
 
 %ifarch x86_64
 aclocal
@@ -112,7 +118,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.0.1
+* Tue Aug 29 2006 Denis Leroy <denis at poolshark.org> - 2.0.1-8
+- Added patches for bugs 203615, 203616 and 203618
+
+* Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.0.1-7
 - FE6 Rebuild
 
 * Thu Aug 10 2006 Denis Leroy <denis at poolshark.org> - 2.0.1-6