diff options
Diffstat (limited to 'src/modem-manager/nm-modem.h')
| -rw-r--r-- | src/modem-manager/nm-modem.h | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/src/modem-manager/nm-modem.h b/src/modem-manager/nm-modem.h index a46a198c..6e47c903 100644 --- a/src/modem-manager/nm-modem.h +++ b/src/modem-manager/nm-modem.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 - 2011 Red Hat, Inc. + * Copyright (C) 2009 Red Hat, Inc. * Copyright (C) 2009 Novell, Inc. */ @@ -46,8 +46,7 @@ G_BEGIN_DECLS #define NM_MODEM_PPP_FAILED "ppp-failed" #define NM_MODEM_PREPARE_RESULT "prepare-result" #define NM_MODEM_IP4_CONFIG_RESULT "ip4-config-result" -#define NM_MODEM_AUTH_REQUESTED "auth-requested" -#define NM_MODEM_AUTH_RESULT "auth-result" +#define NM_MODEM_NEED_AUTH "need-auth" typedef struct { GObject parent; @@ -67,11 +66,6 @@ typedef struct { NMConnection *connection, GError **error); - gboolean (*complete_connection) (NMModem *modem, - NMConnection *connection, - const GSList *existing_connections, - GError **error); - NMConnection * (*get_best_auto_connection) (NMModem *modem, GSList *connections, char **specific_object); @@ -82,7 +76,7 @@ typedef struct { const char **out_setting_name, NMDeviceStateReason *reason); - void (*deactivate) (NMModem *self, NMDevice *device); + void (*deactivate_quickly) (NMModem *self, NMDevice *device); /* Signals */ void (*ppp_stats) (NMModem *self, guint32 in_bytes, guint32 out_bytes); @@ -91,15 +85,18 @@ typedef struct { void (*prepare_result) (NMModem *self, gboolean success, NMDeviceStateReason reason); void (*ip4_config_result) (NMModem *self, const char *iface, NMIP4Config *config, GError *error); - void (*auth_requested) (NMModem *self); - void (*auth_result) (NMModem *self, GError *error); + void (*need_auth) (NMModem *self, + const char *setting_name, + gboolean retry, + RequestSecretsCaller caller, + const char *hint1, + const char *hint2); } NMModemClass; GType nm_modem_get_type (void); /* Protected */ -NMPPPManager *nm_modem_get_ppp_manager (NMModem *modem); DBusGProxy * nm_modem_get_proxy (NMModem *modem, const char *interface); const char * nm_modem_get_iface (NMModem *modem); const char * nm_modem_get_path (NMModem *modem); @@ -112,11 +109,6 @@ gboolean nm_modem_check_connection_compatible (NMModem *self, NMConnection *connection, GError **error); -gboolean nm_modem_complete_connection (NMModem *self, - NMConnection *connection, - const GSList *existing_connections, - GError **error); - NMActStageReturn nm_modem_act_stage1_prepare (NMModem *modem, NMActRequest *req, NMDeviceStateReason *reason); @@ -136,12 +128,7 @@ NMActStageReturn nm_modem_stage4_get_ip4_config (NMModem *modem, NMIP4Config **config, NMDeviceStateReason *reason); -gboolean nm_modem_get_secrets (NMModem *modem, - const char *setting_name, - gboolean request_new, - const char *hint); - -void nm_modem_deactivate (NMModem *modem, NMDevice *device); +void nm_modem_deactivate_quickly (NMModem *modem, NMDevice *device); void nm_modem_device_state_changed (NMModem *modem, NMDeviceState new_state, @@ -152,6 +139,14 @@ gboolean nm_modem_hw_is_up (NMModem *modem, NMDevice *device); gboolean nm_modem_hw_bring_up (NMModem *modem, NMDevice *device, gboolean *no_firmware); +gboolean nm_modem_connection_secrets_updated (NMModem *modem, + NMActRequest *req, + NMConnection *connection, + GSList *updated_settings, + RequestSecretsCaller caller); + +const DBusGObjectInfo *nm_modem_get_serial_dbus_info (void); + gboolean nm_modem_get_mm_enabled (NMModem *self); void nm_modem_set_mm_enabled (NMModem *self, gboolean enabled); |