From 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 10:51:42 +0200 Subject: New upstream version 1.19.90 --- src/nm-dispatcher.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/nm-dispatcher.h') diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index 1cdeeb88..5c6c5805 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager -- Network link manager * * This program is free software; you can redistribute it and/or modify @@ -39,18 +38,20 @@ typedef enum { NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE } NMDispatcherAction; -typedef void (*NMDispatcherFunc) (guint call_id, gpointer user_data); +typedef struct NMDispatcherCallId NMDispatcherCallId; + +typedef void (*NMDispatcherFunc) (NMDispatcherCallId *call_id, gpointer user_data); gboolean nm_dispatcher_call_hostname (NMDispatcherFunc callback, gpointer user_data, - guint *out_call_id); + NMDispatcherCallId **out_call_id); gboolean nm_dispatcher_call_device (NMDispatcherAction action, NMDevice *device, NMActRequest *act_request, NMDispatcherFunc callback, gpointer user_data, - guint *out_call_id); + NMDispatcherCallId **out_call_id); gboolean nm_dispatcher_call_device_sync (NMDispatcherAction action, NMDevice *device, @@ -66,7 +67,7 @@ gboolean nm_dispatcher_call_vpn (NMDispatcherAction action, NMIP6Config *vpn_ip6_config, NMDispatcherFunc callback, gpointer user_data, - guint *out_call_id); + NMDispatcherCallId **out_call_id); gboolean nm_dispatcher_call_vpn_sync (NMDispatcherAction action, NMSettingsConnection *settings_connection, @@ -80,10 +81,8 @@ gboolean nm_dispatcher_call_vpn_sync (NMDispatcherAction action, gboolean nm_dispatcher_call_connectivity (NMConnectivityState state, NMDispatcherFunc callback, gpointer user_data, - guint *out_call_id); - -void nm_dispatcher_call_cancel (guint call_id); + NMDispatcherCallId **out_call_id); -void nm_dispatcher_init (void); +void nm_dispatcher_call_cancel (NMDispatcherCallId *call_id); #endif /* __NM_DISPATCHER_H__ */ -- cgit 1.3.0-6-gf8a5