diff --git a/ChangeLog b/ChangeLog
index 68851549a3..fea4e7c506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-18  Michael Natterer  <mitch@gimp.org>
+
+	* tools/Makefile.am
+	* tools/test-clipboard.c: new file, a test hack for clipboard
+	debugging.
+
 2005-05-17  Helvetix Victorinox  <helvetix@gimp.org>
 
 	* app/composite/gimp-composite-sse2.c:
diff --git a/tools/.cvsignore b/tools/.cvsignore
index 6c00c11716..7b38332329 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
 .libs
 kernelgen
 gimp-remote-2.3
+test-clipboard
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d2b8a175cd..953e9f625e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,6 +10,8 @@ SUBDIRS = $(D_pdbgen)
 
 bin_PROGRAMS = $(GIMP_REMOTE)
 
+noinst_PROGRAMS = test-clipboard
+
 EXTRA_PROGRAMS = \
 	gimp-remote-2.3	\
 	kernelgen
@@ -22,6 +24,11 @@ gimp_remote_2_3_LDADD = \
 
 kernelgen_SOURCES = kernelgen.c
 
+test_clipboard_SURCES = test-clipboard.c
+
+test_clipboard_LDADD = \
+	$(GTK_LIBS)
+
 AM_CPPFLAGS = \
 	-DGIMP_APP_VERSION=\"@GIMP_APP_VERSION@\"	\
 	-DLOCALEDIR=\""$(gimplocaledir)"\"
diff --git a/tools/test-clipboard.c b/tools/test-clipboard.c
new file mode 100644
index 0000000000..f6993d4c92
--- /dev/null
+++ b/tools/test-clipboard.c
@@ -0,0 +1,195 @@
+/*
+ * test-clipboard.c -- do clipboard things
+ *
+ * Copyright (C) 2005  Michael Natterer <mitch@gimp.org>
+ *
+ * Use this code for whatever you like.
+ */
+
+#include <stdlib.h>
+
+#include <gtk/gtk.h>
+
+
+static void   test_clipboard_list_targets  (GtkClipboard     *clipboard);
+static void   test_clipboard_copy          (GtkClipboard     *clipboard,
+                                            const gchar      *mime_type,
+                                            const gchar      *filename);
+static void   test_clipboard_copy_callback (GtkClipboard     *clipboard,
+                                            GtkSelectionData *selection,
+                                            guint             info,
+                                            gpointer          data);
+
+
+gint
+main (gint   argc,
+      gchar *argv[])
+{
+  GOptionContext *context;
+  GtkClipboard   *clipboard;
+  GError         *error = NULL;
+
+  /*  options  */
+  static gboolean  list_targets   = FALSE;
+  static gchar    *mime_type      = NULL;
+  static gchar    *copy_filename  = NULL;
+  static gchar    *paste_filename = NULL;
+
+  static const GOptionEntry main_entries[] =
+  {
+    {
+      "list-targets", 'l', 0,
+      G_OPTION_ARG_NONE, &list_targets,
+      "List the targets offered by the clipboard", NULL
+    },
+    {
+      "mime-type", 'm', 0,
+      G_OPTION_ARG_STRING, &mime_type,
+      "The mime-type", "<mime-type>"
+    },
+    {
+      "copy", 'c', 0,
+      G_OPTION_ARG_STRING, &copy_filename,
+      "Copy <file> to clipboard", "<file>"
+    },
+    {
+      "paste", 'p', 0,
+      G_OPTION_ARG_STRING, &paste_filename,
+      "Paste clipoard into <file>", "<file>"
+    }
+  };
+
+  context = g_option_context_new (NULL);
+  g_option_context_add_main_entries (context, main_entries, NULL);
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
+
+  if (! g_option_context_parse (context, &argc, &argv, &error))
+    {
+      if (error)
+        {
+          g_printerr ("%s\n", error->message);
+          g_error_free (error);
+        }
+      else
+        {
+          g_print ("%s\n",
+                   "Could not initialize the graphical user interface.\n"
+                   "Make sure a proper setup for your display environment "
+                   "exists.");
+        }
+
+      return EXIT_FAILURE;
+    }
+
+  if (argc < 1)
+    {
+      g_printerr ("Usage: %s -m <mime-type> -c <file>\n", argv[0]);
+      return -1;
+    }
+
+  gtk_init (&argc, &argv);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (! clipboard)
+    g_error ("gtk_clipboard_get_for_display");
+
+  if (list_targets)
+    {
+      test_clipboard_list_targets (clipboard);
+      return EXIT_SUCCESS;
+    }
+
+  if (copy_filename)
+    {
+      if (! mime_type)
+        g_printerr ("Usage: %s -m <mime-type> -p <file>\n", argv[0]);
+
+      test_clipboard_copy (clipboard, mime_type, copy_filename);
+      return EXIT_SUCCESS;
+    }
+
+  if (paste_filename)
+    {
+      if (! mime_type)
+        g_printerr ("Usage: %s -m <mime-type> -c <file>\n", argv[0]);
+
+      g_printerr ("unimplemented\n");
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}
+
+static void
+test_clipboard_list_targets (GtkClipboard *clipboard)
+{
+  GtkSelectionData *data;
+
+  data = gtk_clipboard_wait_for_contents (clipboard,
+                                          gdk_atom_intern ("TARGETS",
+                                                           FALSE));
+  if (data)
+    {
+      GdkAtom  *targets;
+      gint      n_targets;
+      gboolean  success;
+
+      success = gtk_selection_data_get_targets (data, &targets, &n_targets);
+
+      gtk_selection_data_free (data);
+
+      if (success)
+        {
+          gint i;
+
+          for (i = 0; i < n_targets; i++)
+            g_print ("%s\n", gdk_atom_name (targets[i]));
+
+          g_free (targets);
+        }
+    }
+}
+
+static void
+test_clipboard_copy (GtkClipboard *clipboard,
+                     const gchar  *mime_type,
+                     const gchar  *filename)
+{
+  GtkTargetEntry target;
+
+  target.target = g_strdup (mime_type);
+  target.flags  = 0;
+  target.info   = 1;
+
+  if (! gtk_clipboard_set_with_data (clipboard, &target, 1,
+                                     test_clipboard_copy_callback,
+                                     NULL,
+                                     (gpointer) filename))
+    g_error ("gtk_clipboard_set_with_data");
+
+  gtk_main ();
+}
+
+static void
+test_clipboard_copy_callback (GtkClipboard     *clipboard,
+                              GtkSelectionData *selection,
+                              guint             info,
+                              gpointer          data)
+{
+  gchar  *filename = data;
+  gchar  *buf;
+  gsize   buf_size;
+  GError *error = NULL;
+
+  if (! g_file_get_contents (filename, &buf, &buf_size, &error))
+    g_error ("g_file_get_contents: %s", error->message);
+
+  gtk_selection_data_set (selection, selection->target,
+                          8, (guchar *) buf, buf_size);
+
+  g_free (buf);
+
+  gtk_main_quit ();
+}