From 5acd15d21bddf405beb68817c92b7ea4d48d5a15 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 29 Mar 2011 15:26:03 +0200 Subject: [PATCH] tests: Make test_init() not check for gdk-pixbuf anymore gdk-pixbuf is system-installed these days. --- tests/testcombochange.c | 8 ++------ tests/testdnd.c | 8 ++------ tests/testgtk.c | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/testcombochange.c b/tests/testcombochange.c index 042c4bfd1..7cbb8e7b9 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -31,12 +31,8 @@ static char next_value = 'A'; static void test_init (void) { - if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la", - G_FILE_TEST_EXISTS)) - { - g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE); - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); - } + 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 diff --git a/tests/testdnd.c b/tests/testdnd.c index 375e5ab85..26ea1b2f1 100644 --- a/tests/testdnd.c +++ b/tests/testdnd.c @@ -576,12 +576,8 @@ source_drag_data_delete (GtkWidget *widget, void test_init (void) { - if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la", - G_FILE_TEST_EXISTS)) - { - g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE); - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); - } + if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS)) + g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); } int diff --git a/tests/testgtk.c b/tests/testgtk.c index e21861421..bfe4b7726 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -10101,12 +10101,8 @@ create_main_window (void) static void test_init (void) { - if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la", - G_FILE_TEST_EXISTS)) - { - g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE); - g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE); - } + 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 * -- 2.43.2