[eclipse-pydev] 31/38: Readd and rebase no-e4.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository eclipse-pydev.

commit ad349f34c25f1265e7bd7e9baaee9b12da1c361f
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Feb 27 00:55:49 2015 +0100

    Readd and rebase no-e4.patch
---
 debian/patches/no-e4.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/no-e4.patch b/debian/patches/no-e4.patch
new file mode 100644
index 0000000..beac6fe
--- /dev/null
+++ b/debian/patches/no-e4.patch
@@ -0,0 +1,39 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 27 Feb 2015 00:55:36 +0100
+Subject: no e4
+
+---
+ .../src/org/python/pydev/shared_ui/SharedUiPlugin.java              | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java b/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
+index 74f4e3a..6f16097 100644
+--- a/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
++++ b/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
+@@ -10,8 +10,6 @@ import java.lang.reflect.Field;
+ 
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.Status;
+-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+-import org.eclipse.e4.ui.services.IStylingEngine;
+ import org.eclipse.jface.resource.ImageDescriptor;
+ import org.eclipse.swt.graphics.Color;
+ import org.eclipse.swt.widgets.Control;
+@@ -105,7 +103,7 @@ public class SharedUiPlugin extends AbstractUIPlugin {
+ 
+     @SuppressWarnings("restriction")
+     public static void setCssId(Object control, String id, boolean applyToChildren) {
+-        try {
++/*        try {
+             IStylingEngine engine = (IStylingEngine) UIUtils.getActiveWorkbenchWindow().
+                     getService(IStylingEngine.class);
+             if (engine != null) {
+@@ -118,7 +116,7 @@ public class SharedUiPlugin extends AbstractUIPlugin {
+             //Ignore: older versions of Eclipse won't have it!
+             // e.printStackTrace();
+         }
+-    }
++*/  }
+ 
+     public static void fixSelectionStatusDialogStatusLineColor(Object dialog, Color color) {
+         //TODO: Hack: remove when MessageLine is styleable.
diff --git a/debian/patches/series b/debian/patches/series
index b4896f9..234ea50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ python.pydev.jython-MANIFEST.patch
 python.pydev.core-MANIFEST.patch
 python.pydev.shared_core-MANIFEST.patch
 WorkspaceStub.patch
+no-e4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git