summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--ChangeLog.pre-2-1016
-rw-r--r--ChangeLog.pre-2-416
-rw-r--r--ChangeLog.pre-2-616
-rw-r--r--ChangeLog.pre-2-816
-rw-r--r--demos/gtk-demo/main.c4
-rw-r--r--demos/pixbuf-init.c2
-rw-r--r--gdk/x11/gdkdisplay-x11.c5
-rw-r--r--tests/testdnd.c5
-rw-r--r--tests/testgtk.c4
-rw-r--r--tests/testtext.c4
11 files changed, 91 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index fc271c799..de7dc1cda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fc271c799..de7dc1cda 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fc271c799..de7dc1cda 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fc271c799..de7dc1cda 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fc271c799..de7dc1cda 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 4b5028759..d0acf2733 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -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 -- */
diff --git a/demos/pixbuf-init.c b/demos/pixbuf-init.c
index 4df865eb7..83ec387bc 100644
--- a/demos/pixbuf-init.c
+++ b/demos/pixbuf-init.c
@@ -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);
}
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index dea04722d..0de2d587e 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -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
diff --git a/tests/testdnd.c b/tests/testdnd.c
index 600811235..88ff0345e 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -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);
}
}
diff --git a/tests/testgtk.c b/tests/testgtk.c
index b6e982125..093aa6daa 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -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);
}
}
diff --git a/tests/testtext.c b/tests/testtext.c
index c188100c9..e27ce80be 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -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);
}
}
View Lorry Controller Status