Use g_setenv() instead of putenv().

[~andy/gtk] / tests / testdnd.c

diff --git a/tests/testdnd.c b/tests/testdnd.c
index 8e4e9333a9c33f0faacce1b5925e09798447b496..88ff0345ed9679d99139dff6ca8409a211ba0207 100644 (file)
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -1,4 +1,3 @@
-#include <stdlib.h> /* putenv */
 #include "gtk/gtk.h"
 
 /* Target side drag signals */
@@ -281,7 +280,7 @@ enum {
 static GtkTargetEntry target_table[] = {
   { "STRING",     0, TARGET_STRING },
   { "text/plain", 0, TARGET_STRING },
-  { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
+  { "application/x-rootwindow-drop", 0, TARGET_ROOTWIN }
 };
 
 static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
@@ -311,7 +310,7 @@ target_drag_motion     (GtkWidget          *widget,
     {
       have_drag = TRUE;
       gtk_image_set_from_pixmap (GTK_IMAGE (widget),
-                                trashcan_closed, trashcan_closed_mask);
+                                trashcan_open, trashcan_open_mask);
     }
 
   source_widget = gtk_drag_get_source_widget (context);
@@ -561,8 +560,8 @@ test_init ()
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
     {
-      putenv ("GDK_PIXBUF_MODULE_FILE=../gdk-pixbuf/gdk-pixbuf.loaders");
-      putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
     }
 }