Mercurial > pidgin.yaz
diff finch/libgnt/gntmain.c @ 18526:09db6fec9dce
Allow having a callback after the child process terminates. Use the callback
to remove the temporary file used by the pager.
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Fri, 13 Jul 2007 16:50:03 +0000 |
parents | ec80e921818c |
children | 0873698f8cce 9f7587b86b0d |
line wrap: on
line diff
--- a/finch/libgnt/gntmain.c Fri Jul 13 16:05:30 2007 +0000 +++ b/finch/libgnt/gntmain.c Fri Jul 13 16:50:03 2007 +0000 @@ -306,7 +306,7 @@ But irssi does this, so I am going to assume the crashes were caused by some other stuff. */ - g_printerr("gntmain: setting up IO\n"); + g_printerr("gntmain: setting up IO (%d)\n", channel_read_callback); } static gboolean @@ -643,9 +643,21 @@ } #if GLIB_CHECK_VERSION(2,4,0) +typedef struct +{ + void (*callback)(int status, gpointer data); + gpointer data; +} ChildProcess; + static void reap_child(GPid pid, gint status, gpointer data) { + ChildProcess *cp = data; + if (cp->callback) { + cp->callback(status, cp->data); + } + g_free(cp); + clean_pid(); wm->mode = GNT_KP_MODE_NORMAL; clear(); setup_io(); @@ -654,10 +666,12 @@ #endif gboolean gnt_giveup_console(const char *wd, char **argv, char **envp, - gint *stin, gint *stout, gint *sterr) + gint *stin, gint *stout, gint *sterr, + void (*callback)(int status, gpointer data), gpointer data) { #if GLIB_CHECK_VERSION(2,4,0) GPid pid = 0; + ChildProcess *cp = NULL; if (!g_spawn_async_with_pipes(wd, argv, envp, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, @@ -665,9 +679,12 @@ &pid, stin, stout, sterr, NULL)) return FALSE; + cp = g_new0(ChildProcess, 1); + cp->callback = callback; + cp->data = data; g_source_remove(channel_read_callback); wm->mode = GNT_KP_MODE_WAIT_ON_CHILD; - g_child_watch_add(pid, reap_child, NULL); + g_child_watch_add(pid, reap_child, cp); return TRUE; #else