diff options
author | Alexander Kurtakov | 2016-11-28 13:24:26 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-11-29 08:19:40 +0000 |
commit | 006bf1246a0d3de2c87923d9d0be240c733bb216 (patch) | |
tree | 57caaa3f50328ee0ca71da80f58c7c52a1d66e52 /features | |
parent | 459572de84a844b16a669def2bb5cc5a6d5b8ffb (diff) | |
download | rt.equinox.framework-006bf1246a0d3de2c87923d9d0be240c733bb216.tar.gz rt.equinox.framework-006bf1246a0d3de2c87923d9d0be240c733bb216.tar.xz rt.equinox.framework-006bf1246a0d3de2c87923d9d0be240c733bb216.zip |
Bug 508291 - Remove unneeded gtk calls
Function gtk_set_locale call is not needed with gtk 2.24+ as gtk_init
does it by default. Also remove other unused binding too.
Change-Id: I92ca6d16d502ddbd2ef8603320cffdd59afa6996
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'features')
3 files changed, 0 insertions, 7 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.h b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.h index 6e2cd52bd..b23c9fb09 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.h +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtk.h @@ -23,7 +23,6 @@ struct GTK_PTRS { gboolean (*gtk_init_check) (int*, char***); gboolean (*gtk_init_with_args) (int*, char***, const char *, void *, const char *, GError **); GtkWidget* (*gtk_message_dialog_new) (GtkWindow*, GtkDialogFlags, GtkMessageType, GtkButtonsType, const gchar*, ...); - gchar* (*gtk_set_locale) (); void (*gtk_widget_destroy) (GtkWidget*); void (*gtk_widget_destroyed) (GtkWidget*, GtkWidget**); void (*gtk_widget_show_all) (GtkWidget*); @@ -37,7 +36,6 @@ struct GTK_PTRS { gulong (*g_signal_connect_data) (gpointer, const gchar*, GCallback, gpointer, GClosureNotify, GConnectFlags); gboolean (*g_main_context_iteration) (GMainContext*, gboolean); void (*g_object_unref) (gpointer); - GObject* (*g_object_new) (GType, const gchar*, ...); guint (*g_timeout_add) (guint, GSourceFunc, gpointer); void (*g_error_free) (GError *); @@ -51,7 +49,6 @@ struct GTK_PTRS { GdkPixbuf* (*gdk_pixbuf_scale_simple) (const GdkPixbuf*, int, int, GdkInterpType); int (*gdk_pixbuf_get_width) (const GdkPixbuf*); int (*gdk_pixbuf_get_height) (const GdkPixbuf*); - void (*gdk_set_program_class) (const char*); GdkScreen * (*gdk_screen_get_default) (); double (*gdk_screen_get_resolution) (GdkScreen *); diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkCommon.c b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkCommon.c index a244a825d..7dbc86012 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkCommon.c +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkCommon.c @@ -90,7 +90,6 @@ int initWindowSystem(int* pArgc, char* argv[], int showSplash) } /* 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)) { 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 200a05848..15dda64d7 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c @@ -36,7 +36,6 @@ static FN_TABLE gtkFunctions[] = { FN_TABLE_ENTRY(gtk_init_check, 1), FN_TABLE_ENTRY(gtk_init_with_args, 0), FN_TABLE_ENTRY(gtk_message_dialog_new, 1), - FN_TABLE_ENTRY(gtk_set_locale, 0), FN_TABLE_ENTRY(gtk_widget_destroy, 1), FN_TABLE_ENTRY(gtk_widget_destroyed, 1), FN_TABLE_ENTRY(gtk_widget_show_all, 1), @@ -50,7 +49,6 @@ static FN_TABLE gtkFunctions[] = { }; /* functions from libgdk-x11-2.0 or libgdk-3.so.0*/ static FN_TABLE gdkFunctions[] = { - FN_TABLE_ENTRY(gdk_set_program_class, 1), FN_TABLE_ENTRY(gdk_display_get_default, 1), FN_TABLE_ENTRY(gdk_x11_display_get_xdisplay, 1), FN_TABLE_ENTRY(gdk_screen_get_default, 1), @@ -181,7 +179,6 @@ int loadGtk() { 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)) { |