diff options
author | Leo Ufimtsev | 2018-01-26 19:44:48 +0000 |
---|---|---|
committer | Leo Ufimtsev | 2018-01-26 19:44:48 +0000 |
commit | 99ea6b27ab528bdc5a5158fab0b9c8f4208a359a (patch) | |
tree | 49a084d7d4c22704861b22fedb25ab4105706c9f /features | |
parent | 65ca41b1f452e1f1e15f55c0bf09339f72e065eb (diff) | |
download | rt.equinox.framework-99ea6b27ab528bdc5a5158fab0b9c8f4208a359a.tar.gz rt.equinox.framework-99ea6b27ab528bdc5a5158fab0b9c8f4208a359a.tar.xz rt.equinox.framework-99ea6b27ab528bdc5a5158fab0b9c8f4208a359a.zip |
Bug 530397 - [Gtk] Make gdbus initialization dynamic (launcher part)I20180130-2000
Remove setting of system property as gdbus is now initialized
dynamically.
Verified with SWT's dynamic gdbus patch.
Change-Id: Ia591865568bd2c3c8d84c5473b10404e26788df8
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
Diffstat (limited to 'features')
3 files changed, 0 insertions, 19 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index d848d03be..20a2d3582 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -1103,12 +1103,6 @@ static void getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmA /* If the user specified "-vmargs", add them instead of the default VM args. */ vmArg = (userVMarg != NULL) ? userVMarg : getArgVM( (launchMode == LAUNCH_JNI) ? jniLib : javaVM ); -#ifdef LINUX - // Append flags needed for SWT to understand it's started from launcher to provide things like dbus support. - vmArg = concatArgs(vmArg, gtkPlatformJavaSystemProperties); -#endif - - adjustVMArgs(javaVM, jniLib, &vmArg); /* Calculate the number of VM arguments. */ diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipseOS.h b/features/org.eclipse.equinox.executable.feature/library/eclipseOS.h index 14035c30a..3904d05ca 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipseOS.h +++ b/features/org.eclipse.equinox.executable.feature/library/eclipseOS.h @@ -38,9 +38,6 @@ extern _TCHAR** initialArgv; /* argv originally used to start launcher */ extern _TCHAR* eeLibPath; /* library path specified in a .ee file */ extern int secondThread; /* whether or not to start the vm on a second thread */ -#ifdef LINUX -extern char* gtkPlatformJavaSystemProperties []; -#endif /* OS Specific Functions */ diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.c b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.c index e26e48a4d..e2ea85435 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.c +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.c @@ -40,16 +40,6 @@ char* shippedVMDir = "jre/bin/"; /* Define the special arguments for the various Java VMs. */ static char* argVM_JAVA[] = { NULL }; -/* - * Define arguments that are required/used by platform (e.g SWT) to function properly on gtk. (via Java's System.getProperty(..)). - * These should not affect JVM itself (e.g flags shouldn't set things like memory usage of the JVM). - * - * Note, these may re-occur in *.product (i.e eclipse.ini) such that "java -jar launcher" would work (e.g a child eclipse). - * See bug 528414. - * - * For swt.dbus.init, see bottom of method (SWT/Gtk) Display.java:createDisplay(). - */ -char* gtkPlatformJavaSystemProperties [] = { "-Dswt.dbus.init", NULL}; /* Define local variables . */ static GtkWidget* splashHandle = 0; |