summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-05-26 00:20:59 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-05-26 00:20:59 -0400
commit5a6bfa2674c5dd84e66738eca94d6c5d084d000d (patch)
treed73b1b61d4b35925b9e02a7b17d965eab3ee2f6f /demos
parent7f6e51ba2f50f032baf284033c0a33f245fef1df (diff)
downloadgtk+-5a6bfa2674c5dd84e66738eca94d6c5d084d000d.tar.gz
Remove no-longer-needed pixbuf_init hack
Since gdk-pixbuf is now a separate project again, we no longer need to locate it inside our source tree.
Diffstat (limited to 'demos')
-rw-r--r--demos/Makefile.am6
-rw-r--r--demos/pixbuf-demo.c3
-rw-r--r--demos/testpixbuf-scale.c4
3 files changed, 3 insertions, 10 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am
index dfe3a7d752..ad306562f4 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -41,9 +41,9 @@ pixbuf_demo_LDADD = $(LDADDS)
testpixbuf_save_SOURCES = testpixbuf-save.c
testpixbuf_color_SOURCES = testpixbuf-color.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
-testanimation_SOURCES = testanimation.c pixbuf-init.c
-pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
+testpixbuf_scale_SOURCES = testpixbuf-scale.c
+testanimation_SOURCES = testanimation.c
+pixbuf_demo_SOURCES = pixbuf-demo.c
EXTRA_DIST += \
apple-red.png \
diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 4448072eb3..64b3f0490a 100644
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -181,14 +181,11 @@ destroy_cb (GObject *object, gpointer data)
gtk_main_quit ();
}
-extern void pixbuf_init();
-
int
main (int argc, char **argv)
{
GtkWidget *window;
- pixbuf_init ();
gtk_init (&argc, &argv);
if (!load_pixbufs ()) {
diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c
index bfff451d9a..65eb2b128d 100644
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -58,8 +58,6 @@ draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
return TRUE;
}
-extern void pixbuf_init();
-
int
main(int argc, char **argv)
{
@@ -71,8 +69,6 @@ main(int argc, char **argv)
GtkRequisition scratch_requisition;
const gchar *creator;
GError *error;
-
- pixbuf_init ();
gtk_init (&argc, &argv);