summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-06-10 11:51:58 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-06-10 11:51:58 +0000
commit593503cb8ca110199d7e22bd9a7d4f5ede29d7cf (patch)
tree8bb382e3fe069337cedc123ae772841dd0dbaa9d
parent789d5bb4e0bfc7b5f47e8c54efee208da6415ad6 (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--gst/gst.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4888c1a9bf..4b888ce70f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2006-06-10 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gst.c: (init_post):
+ move pid declaration to declaration block
+
+2006-06-10 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * 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 dcebcfb52a..6a31275b14 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) {