Use g_setenv() instead of putenv().

This commit is contained in:
Matthias Clasen 2003-08-02 21:35:44 +00:00
parent 88c1c94651
commit 0df78ed774
11 changed files with 91 additions and 13 deletions

View File

@ -1,3 +1,13 @@
2003-08-02 Matthias Clasen <maclas@gmx.de>
* tests/testtext.c (test_init):
* tests/testgtk.c (test_init):
* tests/testdnd.c (test_init):
* demos/pixbuf-init.c (pixbuf_init):
* demos/gtk-demo/main.c (main): Use g_setenv().
* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): Use g_unsetenv().
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
@ -17,6 +27,12 @@ Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
2003-08-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (color_sample_drop_handle)
(palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received): Accept drops with the
wrong format, since the KDE color chooser incorrectly drops application/x-color with
format 8.
* gtk/gtkcolorsel.c (color_sample_drop_handle) (palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received):
Accept drops with the wrong format, since the KDE color chooser

View File

@ -1,3 +1,13 @@
2003-08-02 Matthias Clasen <maclas@gmx.de>
* tests/testtext.c (test_init):
* tests/testgtk.c (test_init):
* tests/testdnd.c (test_init):
* demos/pixbuf-init.c (pixbuf_init):
* demos/gtk-demo/main.c (main): Use g_setenv().
* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): Use g_unsetenv().
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
@ -17,6 +27,12 @@ Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
2003-08-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (color_sample_drop_handle)
(palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received): Accept drops with the
wrong format, since the KDE color chooser incorrectly drops application/x-color with
format 8.
* gtk/gtkcolorsel.c (color_sample_drop_handle) (palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received):
Accept drops with the wrong format, since the KDE color chooser

View File

@ -1,3 +1,13 @@
2003-08-02 Matthias Clasen <maclas@gmx.de>
* tests/testtext.c (test_init):
* tests/testgtk.c (test_init):
* tests/testdnd.c (test_init):
* demos/pixbuf-init.c (pixbuf_init):
* demos/gtk-demo/main.c (main): Use g_setenv().
* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): Use g_unsetenv().
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
@ -17,6 +27,12 @@ Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
2003-08-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (color_sample_drop_handle)
(palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received): Accept drops with the
wrong format, since the KDE color chooser incorrectly drops application/x-color with
format 8.
* gtk/gtkcolorsel.c (color_sample_drop_handle) (palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received):
Accept drops with the wrong format, since the KDE color chooser

View File

@ -1,3 +1,13 @@
2003-08-02 Matthias Clasen <maclas@gmx.de>
* tests/testtext.c (test_init):
* tests/testgtk.c (test_init):
* tests/testdnd.c (test_init):
* demos/pixbuf-init.c (pixbuf_init):
* demos/gtk-demo/main.c (main): Use g_setenv().
* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): Use g_unsetenv().
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
@ -17,6 +27,12 @@ Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
2003-08-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (color_sample_drop_handle)
(palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received): Accept drops with the
wrong format, since the KDE color chooser incorrectly drops application/x-color with
format 8.
* gtk/gtkcolorsel.c (color_sample_drop_handle) (palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received):
Accept drops with the wrong format, since the KDE color chooser

View File

@ -1,3 +1,13 @@
2003-08-02 Matthias Clasen <maclas@gmx.de>
* tests/testtext.c (test_init):
* tests/testgtk.c (test_init):
* tests/testdnd.c (test_init):
* demos/pixbuf-init.c (pixbuf_init):
* demos/gtk-demo/main.c (main): Use g_setenv().
* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): Use g_unsetenv().
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
@ -17,6 +27,12 @@ Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
2003-08-02 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (color_sample_drop_handle)
(palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received): Accept drops with the
wrong format, since the KDE color chooser incorrectly drops application/x-color with
format 8.
* gtk/gtkcolorsel.c (color_sample_drop_handle) (palette_drop_handle):
* gtk/gtkcolorbutton.c (gtk_color_button_drag_data_received):
Accept drops with the wrong format, since the KDE color chooser

View File

@ -812,8 +812,8 @@ main (int argc, char **argv)
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);
}
/* -- End of hack -- */

View File

@ -15,5 +15,5 @@ void
pixbuf_init (void)
{
if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
putenv ("GDK_PIXBUF_MODULE_FILE=../gdk-pixbuf/gdk-pixbuf.loaders");
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
}

View File

@ -764,10 +764,9 @@ _gdk_windowing_set_default_display (GdkDisplay *display)
display_x11->startup_notification_id = g_strdup (startup_id);
/* Clear the environment variable so it won't be inherited by
* child processes and confuse things. unsetenv isn't portable,
* right...
* child processes and confuse things.
*/
putenv ("DESKTOP_STARTUP_ID=");
g_unsetenv ("DESKTOP_STARTUP_ID");
/* Set the startup id on the leader window so it
* applies to all windows we create on this display

View File

@ -1,4 +1,3 @@
#include <stdlib.h> /* putenv */
#include "gtk/gtk.h"
/* Target side drag signals */
@ -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);
}
}

View File

@ -12421,8 +12421,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);
}
}

View File

@ -2537,8 +2537,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);
}
}