Bug 454384 - [GTK+] remove the ability to start eclipse with GTK+ less
than 2.18
Change-Id: Ib69515a694dbacd4fb6f1831bed76fbf1a68e0fa
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c
index 2ff651d..5e37448 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,9 +17,12 @@
struct GTK_PTRS gtk = { 1 }; /* initialize the first field "not_initialized" so we can tell when we've loaded the pointers */
-static _TCHAR* minVerMsg = _T_ECLIPSE("Starting from the Eclipse Mars (4.5) release, \nGTK+ versions below 2.18.0 are not supported.\n\nGTK+ version found is");
-static _TCHAR* minVerTitle = _T_ECLIPSE("Unsupported GTK+ 2 version found");
+static _TCHAR* minVerMsg1 = _T_ECLIPSE("Starting from the Eclipse 4.5 (Mars) release, \nGTK+ versions below");
+static _TCHAR* minVerMsg2 = _T_ECLIPSE("are not supported.\nGTK+ version found is");
+static _TCHAR* minVerTitle = _T_ECLIPSE("Unsupported GTK+ version");
static _TCHAR* gtkInitFail = _T_ECLIPSE("Unable to initialize GTK+\n");
+static _TCHAR* upgradeWarning1 = _T_ECLIPSE("\nPlease upgrade GTK+ to minimum version");
+static _TCHAR* upgradeWarning2 = _T_ECLIPSE("\nor use an older version of Eclipse.\nClick OK to Exit.");
static int minGtkMajorVersion = 2;
static int minGtkMinorVersion = 18;
static int minGtkMicroVersion = 0;
@@ -126,82 +129,65 @@
const char * (*func)(int, int, int);
dlerror();
- char *gtk_version_check_ok = getenv("ECLIPSE_GTK_OK");
- if (gtk_version_check_ok == NULL) {
- *(void**) (&func) = dlsym(gtkLib, "gtk_check_version");
- if (dlerror() == NULL && func) {
- const char *check = (*func)(minGtkMajorVersion, minGtkMinorVersion, minGtkMicroVersion);
- if ((check != NULL) && (gtk.not_initialized == 1)) {
- GtkWidget* dialog;
- gint result;
- int gtkMajorVersion, gtkMinorVersion, gtkMicroVersion;
- void *gtkMajorPtr, *gtkMinorPtr, *gtkMicroPtr;
+ *(void**) (&func) = dlsym(gtkLib, "gtk_check_version");
+ if (dlerror() == NULL && func) {
+ const char *check = (*func)(minGtkMajorVersion, minGtkMinorVersion, minGtkMicroVersion);
+ if (check != NULL) {
+ GtkWidget* dialog;
+ gint result;
+ int gtkMajorVersion, gtkMinorVersion, gtkMicroVersion;
+ void *gtkMajorPtr, *gtkMinorPtr, *gtkMicroPtr;
- /* this code is applicable for GTK+ 2 only*/
- dlerror();
- gtkMajorPtr = dlsym(gtkLib, "gtk_major_version");
- if ((dlerror() != NULL) || (gtkMajorPtr == NULL)) return -1;
- gtkMajorVersion = *(int *)gtkMajorPtr;
+ /* this code is applicable for GTK+ 2 only*/
+ dlerror();
+ gtkMajorPtr = dlsym(gtkLib, "gtk_major_version");
+ if ((dlerror() != NULL) || (gtkMajorPtr == NULL)) return -1;
+ gtkMajorVersion = *(int *)gtkMajorPtr;
- gtkMinorPtr = dlsym(gtkLib, "gtk_minor_version");
- if ((dlerror() != NULL) || (gtkMinorPtr == NULL)) return -1;
- gtkMinorVersion = *(int *)gtkMinorPtr;
+ gtkMinorPtr = dlsym(gtkLib, "gtk_minor_version");
+ if ((dlerror() != NULL) || (gtkMinorPtr == NULL)) return -1;
+ gtkMinorVersion = *(int *)gtkMinorPtr;
- gtkMicroPtr = dlsym(gtkLib, "gtk_micro_version");
- if ((dlerror() != NULL) || (gtkMicroPtr == NULL)) return -1;
- gtkMicroVersion = *(int *)gtkMicroPtr;
+ gtkMicroPtr = dlsym(gtkLib, "gtk_micro_version");
+ if ((dlerror() != NULL) || (gtkMicroPtr == NULL)) return -1;
+ gtkMicroVersion = *(int *)gtkMicroPtr;
+ objLib = dlopen(GOBJ_LIB, DLFLAGS);
+ pixLib = dlopen(PIXBUF_LIB, DLFLAGS);
+ x11Lib = dlopen(X11_LIB, DLFLAGS);
- printf("%s %d.%d.%d\n", minVerMsg, gtkMajorVersion, gtkMinorVersion, gtkMicroVersion);
+ memset(>k, 0, sizeof(struct GTK_PTRS));
- objLib = dlopen(GOBJ_LIB, DLFLAGS);
- pixLib = dlopen(PIXBUF_LIB, DLFLAGS);
- x11Lib = dlopen(X11_LIB, DLFLAGS);
+ if ( gtkLib == NULL || loadGtkSymbols(gtkLib, gtkFunctions) != 0) return -1;
+ if ( gdkLib == NULL || loadGtkSymbols(gdkLib, gdkFunctions) != 0) return -1;
+ if ( pixLib == NULL || loadGtkSymbols(pixLib, pixFunctions) != 0) return -1;
+ if ( objLib == NULL || loadGtkSymbols(objLib, gobjFunctions) != 0) return -1;
+ if ( x11Lib == NULL || loadGtkSymbols(x11Lib, x11Functions) != 0) return -1;
- memset(>k, 0, sizeof(struct GTK_PTRS));
-
- if ( gtkLib == NULL || loadGtkSymbols(gtkLib, gtkFunctions) != 0) return -1;
- if ( gdkLib == NULL || loadGtkSymbols(gdkLib, gdkFunctions) != 0) return -1;
- if ( pixLib == NULL || loadGtkSymbols(pixLib, pixFunctions) != 0) return -1;
- if ( objLib == NULL || loadGtkSymbols(objLib, gobjFunctions) != 0) return -1;
- if ( x11Lib == NULL || loadGtkSymbols(x11Lib, x11Functions) != 0) return -1;
-
- /* Initialize GTK. */
- if (gtk.gtk_set_locale) gtk.gtk_set_locale();
- if (gtk.gtk_init_with_args) {
- GError *error = NULL;
- if (!gtk.gtk_init_with_args(0, NULL, NULL, NULL, NULL, &error)) {
- printf("%s", gtkInitFail);
- exit (1);
- }
- }
- dialog = gtk.gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO,
- "%s %d.%d.%d\nDo you want to continue with unsupported GTK+ version?", minVerMsg, gtkMajorVersion, gtkMinorVersion, gtkMicroVersion);
- gtk.gtk_window_set_title((GtkWindow*)dialog, minVerTitle);
- result = gtk.gtk_dialog_run((GtkDialog*)dialog);
- switch (result) {
- case GTK_RESPONSE_YES:
- gtk.gtk_widget_destroy(dialog);
- setenv("ECLIPSE_GTK_OK", "1", 1);
- return 0;
- break;
- default:
- gtk.gtk_widget_destroy(dialog);
- dlclose(gdkLib);
- dlclose(gtkLib);
- gdkLib = gtkLib = NULL;
- setenv("ECLIPSE_GTK_OK", "0", 1);
- exit (1);
+ /* Initialize GTK. */
+ if (gtk.gtk_set_locale) gtk.gtk_set_locale();
+ if (gtk.gtk_init_with_args) {
+ GError *error = NULL;
+ if (!gtk.gtk_init_with_args(0, NULL, NULL, NULL, NULL, &error)) {
+ printf("%s", gtkInitFail);
+ exit (1);
}
}
+ dialog = gtk.gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ "%s %d.%d.%d %s %d.%d.%d.\n%s %d.%d.%d %s", minVerMsg1, minGtkMajorVersion,
+ minGtkMinorVersion, minGtkMicroVersion, minVerMsg2, gtkMajorVersion,
+ gtkMinorVersion, gtkMicroVersion, upgradeWarning1, minGtkMajorVersion,
+ minGtkMinorVersion, minGtkMicroVersion, upgradeWarning2);
+ gtk.gtk_window_set_title((GtkWindow*)dialog, minVerTitle);
+ result = gtk.gtk_dialog_run((GtkDialog*)dialog);
+ gtk.gtk_widget_destroy(dialog);
+ dlclose(gdkLib);
+ dlclose(gtkLib);
+ gdkLib = gtkLib = NULL;
+ exit (1);
}
- } else if (strcmp(gtk_version_check_ok, "0") == 0) {
- exit (1);
- } else {
- setenv("ECLIPSE_GTK_OK", "1", 1);
}
-
}
