diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/op-support.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/gpgme/op-support.c b/gpgme/op-support.c index bcaf8327..14fb6c80 100644 --- a/gpgme/op-support.c +++ b/gpgme/op-support.c @@ -1,24 +1,25 @@ /* op-support.c - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2003 g10 Code GmbH + This file is part of GPGME. + + GPGME is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GPGME is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GPGME; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H #include <config.h> +#endif #include "gpgme.h" #include "context.h" @@ -50,28 +51,27 @@ _gpgme_op_reset (GpgmeCtx ctx, int type) { /* Use private event loop. */ io_cbs.add = _gpgme_add_io_cb; - io_cbs.add_priv = &ctx->fdt; + io_cbs.add_priv = ctx; io_cbs.remove = _gpgme_remove_io_cb; - io_cbs.event = _gpgme_op_event_cb; + io_cbs.event = _gpgme_wait_private_event_cb; io_cbs.event_priv = ctx; } else if (! ctx->io_cbs.add) { /* Use global event loop. */ io_cbs.add = _gpgme_add_io_cb; - io_cbs.add_priv = NULL; + io_cbs.add_priv = ctx; io_cbs.remove = _gpgme_remove_io_cb; - io_cbs.event = _gpgme_wait_event_cb; + io_cbs.event = _gpgme_wait_global_event_cb; io_cbs.event_priv = ctx; } else { /* Use user event loop. */ - io_cbs = ctx->io_cbs; - /* We have to make sure that we notice the termination of the - operation ourself, so we stack another event handler on top - of the user-provided one. */ - io_cbs.event = _gpgme_op_event_cb_user; + io_cbs.add = _gpgme_wait_user_add_io_cb; + io_cbs.add_priv = ctx; + io_cbs.remove = _gpgme_wait_user_remove_io_cb; + io_cbs.event = _gpgme_wait_user_event_cb; io_cbs.event_priv = ctx; } _gpgme_engine_set_io_cbs (ctx->engine, &io_cbs); |