diff options
author | Benjamin Otte <otte@redhat.com> | 2011-03-29 15:26:03 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2011-03-29 15:33:27 +0200 |
commit | 5acd15d21bddf405beb68817c92b7ea4d48d5a15 (patch) | |
tree | 1c7513ba9466ec5ca8cdb7cd4a1f34d66278da9a /tests | |
parent | 8343831c39e852f347a8e6fd99336f38ca17a485 (diff) | |
download | gtk+-5acd15d21bddf405beb68817c92b7ea4d48d5a15.tar.gz |
tests: Make test_init() not check for gdk-pixbuf anymore
gdk-pixbuf is system-installed these days.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testcombochange.c | 8 | ||||
-rw-r--r-- | tests/testdnd.c | 8 | ||||
-rw-r--r-- | tests/testgtk.c | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/tests/testcombochange.c b/tests/testcombochange.c index 042c4bfd1b..7cbb8e7b92 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 375e5ab854..26ea1b2f19 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 e21861421a..bfe4b77263 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 * |