From 593503cb8ca110199d7e22bd9a7d4f5ede29d7cf Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 10 Jun 2006 11:51:58 +0000 Subject: [PATCH] gst/gst.c: move pid declaration to declaration block Original commit message from CVS: * gst/gst.c: (init_post): move pid declaration to declaration block --- ChangeLog | 5 +++++ gst/gst.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4888c1a..4b888ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2006-06-10 Thomas Vander Stichele * gst/gst.c: (init_post): + move pid declaration to declaration block + +2006-06-10 Thomas Vander Stichele + + * gst/gst.c: (init_post): use _exit() instead of exit() in our forked child; this ensures that none of the registered exit handlers from whatever is using GStreamer get executed. This fixes gnome-mixer-applet failing diff --git a/gst/gst.c b/gst/gst.c index dcebcfb..6a31275 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -603,6 +603,10 @@ init_post (void) gboolean changed = FALSE; GList *l; +#ifdef HAVE_FORK + pid_t pid; +#endif + for (l = plugin_paths; l != NULL; l = l->next) { GST_INFO ("Scanning plugin path: \"%s\"", (gchar *) l->data); /* CHECKME: add changed |= here as well? */ @@ -612,10 +616,6 @@ init_post (void) g_list_free (plugin_paths); plugin_paths = NULL; -#ifdef HAVE_FORK - pid_t pid; -#endif - default_registry = gst_registry_get_default (); registry_file = g_strdup (g_getenv ("GST_REGISTRY")); if (registry_file == NULL) { -- 2.7.4