rpms/seamonkey/FC-6 firefox-1.5-dnd-nograb.patch, NONE, 1.1 seamonkey.spec, 1.15, 1.16

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26368

Modified Files:
	seamonkey.spec 
Added Files:
	firefox-1.5-dnd-nograb.patch 
Log Message:
* Wed Feb 07 2007 Kai Engert <kengert at redhat.com> 1.0.7-0.6.1
- Fix the DND implementation to not grab, so it works with new GTK+.
- Fix upgrade path from FC-5 by obsoleting the seamonkey subset
  packages which recently obsoleted mozilla in FC-5.


firefox-1.5-dnd-nograb.patch:

--- NEW FILE firefox-1.5-dnd-nograb.patch ---
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


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- seamonkey.spec	23 Dec 2006 16:41:56 -0000	1.15
+++ seamonkey.spec	7 Feb 2007 05:22:35 -0000	1.16
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.7
-Release:        0.6%{?dist}
+Release:        0.6.1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -42,6 +42,7 @@
 Patch82:        firefox-1.5-pango-mathml.patch
 Patch91 :       firefox-1.5-pango-ua.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
+Patch103:       firefox-1.5-dnd-nograb.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
@@ -71,6 +72,12 @@
 BuildRequires:  fileutils
 BuildRequires:  perl
 
+Obsoletes: seamonkey-chat
+Obsoletes: seamonkey-devel
+Obsoletes: seamonkey-dom-inspector
+Obsoletes: seamonkey-js-debugger
+Obsoletes: seamonkey-mail
+
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 %global nspr_build_time_version %(nspr-config --version)
@@ -124,6 +131,7 @@
 %patch82 -p1
 %patch91 -p0
 %patch101 -p1 -b .gnome-uriloader
+%patch103 -p1
 %patch220 -p1
 %patch225 -p1
 %patch227 -p1
@@ -427,6 +435,10 @@
 
 
 %changelog
+* Wed Feb 07 2007 Kai Engert <kengert at redhat.com> 1.0.7-0.6.1
+- Fix the DND implementation to not grab, so it works with new GTK+.
+- Fix upgrade path from FC-5 by obsoleting the seamonkey subset 
+  packages which recently obsoleted mozilla in FC-5.
 * Sat Dec 23 2006 Kai Engert <kengert at redhat.com> 1.0.7-0.6
 - SeaMonkey 1.0.7
 * Thu Nov 09 2006 Kai Engert <kengert at redhat.com> 1.0.6-0.6.2