- Fix the DND implementation to not grab, so it works with new GTK+.

This commit is contained in:
Christopher Aillon 2007-01-31 04:40:11 +00:00
parent 998aec405f
commit b8d1ef131b
2 changed files with 31 additions and 1 deletions

View File

@ -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

View File

@ -11,7 +11,7 @@
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 2.0.0.1 Version: 2.0.0.1
Release: 3%{?dist} Release: 4%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL License: MPL/LGPL
Group: Applications/Internet Group: Applications/Internet
@ -64,6 +64,7 @@ Patch84: firefox-2.0-pango-printing.patch
Patch100: firefox-1.5-gtk-key-theme-crash.patch Patch100: firefox-1.5-gtk-key-theme-crash.patch
Patch101: firefox-1.5-embedwindow-visibility.patch Patch101: firefox-1.5-embedwindow-visibility.patch
Patch102: firefox-1.5-theme-change.patch Patch102: firefox-1.5-theme-change.patch
Patch103: firefox-1.5-dnd-nograb.patch
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -157,6 +158,7 @@ removed in favor of xulrunner-devel.
#%patch100 -p0 -b .gtk-key-theme-crash #%patch100 -p0 -b .gtk-key-theme-crash
%patch101 -p0 -b .embedwindow-visibility %patch101 -p0 -b .embedwindow-visibility
%patch102 -p0 -b .theme-change %patch102 -p0 -b .theme-change
%patch103 -p1 -b .dnd-nograb
# For branding specific patches. # For branding specific patches.
@ -408,6 +410,9 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %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 * 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. - Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed.