[tor-commits] [tor-messenger-build/master] Rename trac-18290.mozpatch

[sukhbir at torproject.org]

commit ccdbb69a0cc79be95d4cf322f12f46af094f07ef
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Mar 26 06:40:18 2016 -0400

    Rename trac-18290.mozpatch
---
 projects/instantbird/trac-18290.mozpatch | 47 ++++++++++++++++++++++++++++++++
 projects/instantbird/trac-18290.mozpath  | 47 --------------------------------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/projects/instantbird/trac-18290.mozpatch b/projects/instantbird/trac-18290.mozpatch
new file mode 100644
index 0000000..1766fb8
--- /dev/null
+++ b/projects/instantbird/trac-18290.mozpatch
@@ -0,0 +1,47 @@
+From dfb3f02c452b56bd22d7cdf2086b29e118fea688 Mon Sep 17 00:00:00 2001
+From: Georg Koppen <gk at torproject.org>
+Date: Wed, 10 Feb 2016 13:14:03 +0000
+Subject: [PATCH] Disabling view management for mingw-w64 builds
+
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index 85b2879..89be490 100644
+--- a/widget/windows/WindowsUIUtils.cpp
++++ b/widget/windows/WindowsUIUtils.cpp
+@@ -20,6 +20,8 @@
+ #include "nsString.h"
+ #include "nsIWidget.h"
+ 
++/* Disable in mingw-w64 Gecko builds. */
++#if 0
+ #include <windows.ui.viewmanagement.h>
+ 
+ #pragma comment(lib, "runtimeobject.lib")
+@@ -85,6 +87,8 @@ public:
+ };
+ #endif
+ 
++#endif
++
+ WindowsUIUtils::WindowsUIUtils() :
+   mInTabletMode(eTabletModeUnknown)
+ {
+@@ -113,6 +117,7 @@ WindowsUIUtils::GetInTabletMode(bool* aResult)
+ NS_IMETHODIMP
+ WindowsUIUtils::UpdateTabletModeState()
+ {
++#if 0
+   if (!IsWin10OrLater()) {
+     return NS_OK;
+   }
+@@ -168,6 +173,7 @@ WindowsUIUtils::UpdateTabletModeState()
+       }
+     }
+   }
++#endif
+ 
+   return NS_OK;
+ }
+-- 
+2.7.0
+
diff --git a/projects/instantbird/trac-18290.mozpath b/projects/instantbird/trac-18290.mozpath
deleted file mode 100644
index 1766fb8..0000000
--- a/projects/instantbird/trac-18290.mozpath
+++ /dev/null
@@ -1,47 +0,0 @@
-From dfb3f02c452b56bd22d7cdf2086b29e118fea688 Mon Sep 17 00:00:00 2001
-From: Georg Koppen <gk at torproject.org>
-Date: Wed, 10 Feb 2016 13:14:03 +0000
-Subject: [PATCH] Disabling view management for mingw-w64 builds
-
-
-diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
-index 85b2879..89be490 100644
---- a/widget/windows/WindowsUIUtils.cpp
-+++ b/widget/windows/WindowsUIUtils.cpp
-@@ -20,6 +20,8 @@
- #include "nsString.h"
- #include "nsIWidget.h"
- 
-+/* Disable in mingw-w64 Gecko builds. */
-+#if 0
- #include <windows.ui.viewmanagement.h>
- 
- #pragma comment(lib, "runtimeobject.lib")
-@@ -85,6 +87,8 @@ public:
- };
- #endif
- 
-+#endif
-+
- WindowsUIUtils::WindowsUIUtils() :
-   mInTabletMode(eTabletModeUnknown)
- {
-@@ -113,6 +117,7 @@ WindowsUIUtils::GetInTabletMode(bool* aResult)
- NS_IMETHODIMP
- WindowsUIUtils::UpdateTabletModeState()
- {
-+#if 0
-   if (!IsWin10OrLater()) {
-     return NS_OK;
-   }
-@@ -168,6 +173,7 @@ WindowsUIUtils::UpdateTabletModeState()
-       }
-     }
-   }
-+#endif
- 
-   return NS_OK;
- }
--- 
-2.7.0
-