diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2006-06-10 11:51:58 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2006-06-10 11:51:58 +0000 |
commit | 593503cb8ca110199d7e22bd9a7d4f5ede29d7cf (patch) | |
tree | 8bb382e3fe069337cedc123ae772841dd0dbaa9d | |
parent | 789d5bb4e0bfc7b5f47e8c54efee208da6415ad6 (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-- | ChangeLog | 5 | ||||
-rw-r--r-- | gst/gst.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -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 @@ -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) { |