callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle child_setup being NULL. (#445691, Christopher Taylor)

Browse Source 
2007-06-10  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkspawn-x11.c (set_environment): Handle child_setup
        being NULL.  (#445691, Christopher Taylor)



svn path=/trunk/; revision=18097
This commit is contained in:
Matthias Clasen 2007-06-11 00:18:51 +00:00 committed by Matthias Clasen
parent 9b43c45d26
commit 9b8d335ade
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-06-10 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkspawn-x11.c (set_environment): Handle child_setup
being NULL. (#445691, Christopher Taylor)
2007-06-10 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtksearchenginesimple.c: Unconditionally define _GNU_SOURCE

7
gdk/x11/gdkspawn-x11.c
View File

@ -37,8 +37,8 @@ typedef struct {
/*
* Set the DISPLAY variable, and then call the user-specified child setup
* function. This is required so that applications can use gdk_spawn_* and call
* putenv() in their child_setup functions.
* function. This is required so that applications can use gdk_spawn_* and
* call putenv() in their child_setup functions.
*/
static void
set_environment (gpointer user_data)
@ -47,7 +47,8 @@ set_environment (gpointer user_data)
g_setenv ("DISPLAY", setup->display, TRUE);
setup->child_setup (setup->user_data);
if (setup->child_setup)
setup->child_setup (setup->user_data);
}
/**