[gtk+] tests: Remove gdk-pixbuf hacks
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] tests: Remove gdk-pixbuf hacks
- Date: Tue, 2 Oct 2012 17:34:04 +0000 (UTC)
commit eddac4911f6fb113bdee85457207c3f10c18f756
Author: Benjamin Otte <otte redhat com>
Date: Tue Oct 2 17:21:11 2012 +0200
tests: Remove gdk-pixbuf hacks
The code used to check for uninstalled gdk-pixbuf. Since gdk-pixbuf is
an external library these days, those checks aren't necessary anymore.
gtk/tests/Makefile.am | 8 ++++----
gtk/tests/defaultvalue.c | 3 ---
gtk/tests/filechooser.c | 3 ---
gtk/tests/object.c | 3 ---
gtk/tests/pixbuf-init.c | 20 --------------------
gtk/tests/textbuffer.c | 3 ---
6 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 7dbe234..d762a35 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -59,7 +59,7 @@ accel_SOURCES = accel.c
accel_LDADD = $(progs_ldadd)
#TEST_PROGS += object
-#object_SOURCES = object.c pixbuf-init.c
+#object_SOURCES = object.c
#object_LDADD = $(progs_ldadd)
# this doesn't work in make distcheck, since running
@@ -71,7 +71,7 @@ accel_LDADD = $(progs_ldadd)
# Should be ported to new API's
#TEST_PROGS += filechooser
-#filechooser_SOURCES = filechooser.c pixbuf-init.c
+#filechooser_SOURCES = filechooser.c
#filechooser_LDADD = $(progs_ldadd)
TEST_PROGS += builder
@@ -81,12 +81,12 @@ builder_LDFLAGS = -export-dynamic
if OS_UNIX
#TEST_PROGS += defaultvalue
-#defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
+#defaultvalue_SOURCES = defaultvalue.c
#defaultvalue_LDADD = $(progs_ldadd)
endif
TEST_PROGS += textbuffer
-textbuffer_SOURCES = textbuffer.c pixbuf-init.c
+textbuffer_SOURCES = textbuffer.c
textbuffer_LDADD = $(progs_ldadd)
TEST_PROGS += textiter
diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
index 3d2ff8f..ce1ad3b 100644
--- a/gtk/tests/defaultvalue.c
+++ b/gtk/tests/defaultvalue.c
@@ -321,8 +321,6 @@ test_type (gconstpointer data)
g_type_class_unref (klass);
}
-extern void pixbuf_init (void);
-
int
main (int argc, char **argv)
{
@@ -330,7 +328,6 @@ main (int argc, char **argv)
guint i;
gtk_test_init (&argc, &argv);
- pixbuf_init ();
gtk_test_register_all_types();
otypes = gtk_test_list_all_types (NULL);
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 70af762..7341e66 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1065,13 +1065,10 @@ test_folder_switch_and_filters (void)
log_test (passed, "test_folder_switch_and_filters(): all filter tests");
}
-extern void pixbuf_init (void);
-
int
main (int argc,
char **argv)
{
- pixbuf_init ();
/* initialize test program */
gtk_test_init (&argc, &argv);
diff --git a/gtk/tests/object.c b/gtk/tests/object.c
index ff3979e..1e06ded 100644
--- a/gtk/tests/object.c
+++ b/gtk/tests/object.c
@@ -304,8 +304,6 @@ widget_property_tests (gconstpointer test_data)
g_object_unref (widget);
}
-extern void pixbuf_init (void);
-
/* --- main test program --- */
int
main (int argc,
@@ -314,7 +312,6 @@ main (int argc,
const GType *otypes;
guint i;
/* initialize test program */
- pixbuf_init ();
gtk_test_init (&argc, &argv);
gtk_test_register_all_types ();
/* install a property test for each widget type */
diff --git a/gtk/tests/textbuffer.c b/gtk/tests/textbuffer.c
index c192124..e26a5dd 100644
--- a/gtk/tests/textbuffer.c
+++ b/gtk/tests/textbuffer.c
@@ -1319,8 +1319,6 @@ test_tag (void)
g_object_unref (buffer);
}
-extern void pixbuf_init (void);
-
int
main (int argc, char** argv)
{
@@ -1328,7 +1326,6 @@ main (int argc, char** argv)
gtk_set_debug_flags (gtk_get_debug_flags () | GTK_DEBUG_TEXT);
gtk_test_init (&argc, &argv);
- pixbuf_init ();
g_test_add_func ("/TextBuffer/UTF8 unknown char", test_utf8);
g_test_add_func ("/TextBuffer/Line separator", test_line_separator);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]