]> Pileus Git - ~andy/gtk/commitdiff
tests: Make test_init() not check for gdk-pixbuf anymore
authorBenjamin Otte <otte@redhat.com>
Tue, 29 Mar 2011 13:26:03 +0000 (15:26 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 29 Mar 2011 13:33:27 +0000 (15:33 +0200)
gdk-pixbuf is system-installed these days.

tests/testcombochange.c
tests/testdnd.c
tests/testgtk.c

index 042c4bfd1be3c47b4f94980a9e2cda4df5d4127e..7cbb8e7b9297684b0509759972d756ea2461e711 100644 (file)
@@ -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
index 375e5ab854815d29c63361a80be398d324e9b74d..26ea1b2f19f45391123ee843cdea7f4ba1f1d203 100644 (file)
@@ -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 
index e21861421a2dc526bc5430f567d5d3fa9ccfe88e..bfe4b77263561f7abe8e3b778140e6312273cf27 100644 (file)
@@ -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 *