-From d56b1a845aa9a9528eb1f9db8ce8a67d85683b28 Mon Sep 17 00:00:00 2001
+From 262403fb627ca452bfbcaf06fd6ad965f156ed18 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@torproject.org>
 Date: Thu, 26 Apr 2012 10:54:24 -0700
 Subject: [PATCH 16/16] Adapt Steven Michaud's Mac crashfix patch for FF12.
 
 Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35
 
-Some minor tweaks were needed to get it to apply to FF12.
+Some minor tweaks were needed to get it to apply to FF12 and to compile on
+MacOS.
 ---
  widget/Makefile.in                        |    1 +
- widget/cocoa/nsChildView.mm               |   31 +++++++++++--------
+ widget/cocoa/nsChildView.mm               |   35 +++++++++++++--------
  widget/gtk2/nsDragService.cpp             |    2 +-
  widget/gtk2/nsWindow.cpp                  |    2 +-
  widget/nsIDragService.idl                 |    4 +--

 widget/windows/nsPIDragServiceWindows.idl |   46 +++++++++++++++++++++++++++
 widget/xpwidgets/nsBaseDragService.cpp    |   16 +++++++++-
 widget/xpwidgets/nsBaseDragService.h      |    9 ++---
 15 files changed, 176 insertions(+), 49 deletions(-)
 create mode 100644 widget/nsPIDragService.idl
 create mode 100644 widget/windows/nsPIDragServiceWindows.idl


+        nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
+        dragSession->GetDataTransfer(getter_AddRefs(dataTransfer));
+        if (dataTransfer) {
+          nsCOMPtr<nsIDOMNSDataTransfer> dataTransferNS =
+                do_QueryInterface(dataTransfer);
+          if (dataTransferNS) {
+            dataTransferNS->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
+          }
+        }
+      }
     }
