[tor-commits] [tor-messenger-build/master] Rebase block-plugins.mozpatch

[arlo@xxxxxxxxxxxxxx]

commit 17797dde5971517d4e173a25d813cc7644013ad6
Author: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
Date:   Sat Mar 19 07:45:47 2016 -0400

    Rebase block-plugins.mozpatch
---
 projects/instantbird/block-plugins.mozpatch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/instantbird/block-plugins.mozpatch b/projects/instantbird/block-plugins.mozpatch
index 17813be..6e4586a 100644
--- a/projects/instantbird/block-plugins.mozpatch
+++ b/projects/instantbird/block-plugins.mozpatch
@@ -1,7 +1,7 @@
 diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
 --- a/dom/plugins/base/nsPluginHost.cpp
 +++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1834,6 +1834,26 @@
+@@ -2085,6 +2085,26 @@
    }
  }
  
@@ -28,7 +28,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.c
  typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void);
  
  nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
-@@ -1943,6 +1963,10 @@
+@@ -2194,6 +2214,10 @@
        continue;
      }
  
@@ -42,7 +42,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.c
 diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
 --- a/dom/plugins/base/nsPluginHost.h
 +++ b/dom/plugins/base/nsPluginHost.h
-@@ -304,6 +304,8 @@
+@@ -334,6 +334,8 @@
    // Loads all cached plugins info into mCachedPlugins
    nsresult ReadPluginInfo();
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits