diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-06-28 13:08:44 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-28 13:42:02 -0400 |
commit | 01fbf8444b75089003d6b29e2a15d83016b62124 (patch) | |
tree | ac1cc9dc9f9b10ca3742908899fd907f1a924fd5 /tests | |
parent | 1f8c79eca1db3013b9487f3d3ecf9f443081fd5f (diff) | |
download | gtk+-01fbf8444b75089003d6b29e2a15d83016b62124.tar.gz |
Stop setting GTK_IM_MODULE_FILE
GTK no longer reads this environment variable, so
setting it can have no benefit for uninstalled demos
anymore.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testcombochange.c | 9 | ||||
-rw-r--r-- | tests/testdnd.c | 9 | ||||
-rw-r--r-- | tests/testgtk.c | 11 |
3 files changed, 1 insertions, 28 deletions
diff --git a/tests/testcombochange.c b/tests/testcombochange.c index 01bac3379a..a72a44ad46 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -26,13 +26,6 @@ GArray *contents; static char next_value = 'A'; -static void -test_init (void) -{ - if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS)) - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); -} - G_GNUC_PRINTF (1, 2) static void combochange_log (const char *fmt, ...) @@ -200,8 +193,6 @@ main (int argc, char **argv) GtkWidget *combo; GtkCellRenderer *cell_renderer; - test_init (); - gtk_init (); model = gtk_list_store_new (1, G_TYPE_STRING); diff --git a/tests/testdnd.c b/tests/testdnd.c index b81f938dca..ea6e468e38 100644 --- a/tests/testdnd.c +++ b/tests/testdnd.c @@ -494,13 +494,6 @@ popsite_leave (GtkDropControllerMotion *motion) } static void -test_init (void) -{ - if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS)) - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); -} - -static void quit_cb (GtkWidget *widget, gpointer data) { @@ -528,8 +521,6 @@ main (int argc, char **argv) GtkEventController *controller; gboolean done = FALSE; - test_init (); - gtk_init (); window = gtk_window_new (); diff --git a/tests/testgtk.c b/tests/testgtk.c index 28bd0db358..791ea10f46 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -5987,13 +5987,6 @@ create_main_window (void) gtk_widget_show (window); } -static void -test_init (void) -{ - if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS)) - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); -} - static char * pad (const char *str, int to) { @@ -6110,9 +6103,7 @@ main (int argc, char *argv[]) srand (time (NULL)); - test_init (); - - g_set_application_name ("GTK+ Test Program"); + g_set_application_name ("GTK Test Program"); #ifdef GTK_SRCDIR g_chdir (GTK_SRCDIR); |