summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Aillon <caillon@fedoraproject.org>2007-01-31 04:40:11 +0000
committerChristopher Aillon <caillon@fedoraproject.org>2007-01-31 04:40:11 +0000
commitb8d1ef131bca29182100d3971fb535a1a8ed7c38 (patch)
treefa38451d4a74698d21f4ab8b78cc2329b7306259
parentbump rev (diff)
downloadlibrewolf-fedora-ff-b8d1ef131bca29182100d3971fb535a1a8ed7c38.tar.gz
librewolf-fedora-ff-b8d1ef131bca29182100d3971fb535a1a8ed7c38.tar.bz2
librewolf-fedora-ff-b8d1ef131bca29182100d3971fb535a1a8ed7c38.zip
- Fix the DND implementation to not grab, so it works with new GTK+.
-rw-r--r--firefox-1.5-dnd-nograb.patch25
-rw-r--r--firefox.spec7
2 files changed, 31 insertions, 1 deletions
diff --git a/firefox-1.5-dnd-nograb.patch b/firefox-1.5-dnd-nograb.patch
new file mode 100644
index 0000000..ebced04
--- /dev/null
+++ b/firefox-1.5-dnd-nograb.patch
@@ -0,0 +1,25 @@
+See https://bugzilla.mozilla.org/show_bug.cgi?id=367203
+
+Index: mozilla/widget/src/gtk2/nsDragService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
+retrieving revision 1.9.10.1
+diff -d -u -p -r1.9.10.1 nsDragService.cpp
+--- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1
++++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000
+@@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void)
+ void
+ nsDragService::GetTargetDragData(GdkAtom aFlavor)
+ {
+- gtk_grab_add(mHiddenWidget);
+ PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor));
+ PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n",
+ mTargetWidget, mTargetDragContext));
+@@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom
+ gtk_main_iteration();
+ }
+ PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n"));
+- gtk_grab_remove(mHiddenWidget);
+ }
+
+ void
diff --git a/firefox.spec b/firefox.spec
index 884b30b..5820ad9 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -11,7 +11,7 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 2.0.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
@@ -64,6 +64,7 @@ Patch84: firefox-2.0-pango-printing.patch
Patch100: firefox-1.5-gtk-key-theme-crash.patch
Patch101: firefox-1.5-embedwindow-visibility.patch
Patch102: firefox-1.5-theme-change.patch
+Patch103: firefox-1.5-dnd-nograb.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -157,6 +158,7 @@ removed in favor of xulrunner-devel.
#%patch100 -p0 -b .gtk-key-theme-crash
%patch101 -p0 -b .embedwindow-visibility
%patch102 -p0 -b .theme-change
+%patch103 -p1 -b .dnd-nograb
# For branding specific patches.
@@ -408,6 +410,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Jan 30 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.1-4
+- Fix the DND implementation to not grab, so it works with new GTK+.
+
* Thu Jan 18 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.1-3
- Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed.
bgstack15