From 09648b36e217916cd86b346589376fdcf89838d1 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Fri, 25 Jan 2008 18:42:16 +0000 Subject: [PATCH] Restore accidentally removed unsetting of GTK_MODULES. 2008-01-25 Johan Dahlin * gtk/gtktestutils.c (gtk_test_init): Restore accidentally removed unsetting of GTK_MODULES. svn path=/trunk/; revision=19406 --- ChangeLog | 3 +++ gtk/gtktestutils.c | 1 + 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8111b3edbf..986817734a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-01-25 Johan Dahlin + * gtk/gtktestutils.c (gtk_test_init): Restore accidentally removed + unsetting of GTK_MODULES. + * gtk/gtk-builder-convert (GtkBuilderConverter._convert_adjustment): Handle the case where there is no child text node. diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c index cd9d6abf67..dfafa7bfbe 100644 --- a/gtk/gtktestutils.c +++ b/gtk/gtktestutils.c @@ -60,6 +60,7 @@ gtk_test_init (int *argcp, * FUTURE TODO: * - this function could install a mock object around GtkSettings */ + g_setenv ("GTK_MODULES", "", TRUE); g_setenv ("GTK2_RC_FILES", "/dev/null", TRUE); gtk_disable_setlocale(); setlocale (LC_ALL, "C");