---
src/modem-manager/nm-modem-cdma.h | 8 +--
src/modem-manager/nm-modem-gsm.h | 10 ++--
src/modem-manager/nm-modem.c | 114 +++++++++++++++++++-------------------
src/modem-manager/nm-modem.h | 12 ++--
4 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/src/modem-manager/nm-modem-cdma.h
b/src/modem-manager/nm-modem-cdma.h
index d396174..ab1b487 100644
--- a/src/modem-manager/nm-modem-cdma.h
+++ b/src/modem-manager/nm-modem-cdma.h
@@ -26,10 +26,10 @@
G_BEGIN_DECLS
-#define NM_TYPE_MODEM_CDMA (nm_modem_cdma_get_type ())
-#define NM_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_CAST
((obj), NM_TYPE_MODEM_CDMA, NMModemCdma))
-#define NM_MODEM_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
-#define NM_IS_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM_CDMA))
+#define NM_TYPE_MODEM_CDMA (nm_modem_cdma_get_type ())
+#define NM_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NM_TYPE_MODEM_CDMA, NMModemCdma))
+#define NM_MODEM_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
+#define NM_IS_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM_CDMA))
#define NM_IS_MODEM_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
NM_TYPE_MODEM_CDMA))
#define NM_MODEM_CDMA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
diff --git a/src/modem-manager/nm-modem-gsm.h b/src/modem-manager/nm-modem-gsm.h
index 7eb5284..b0f78b0 100644
--- a/src/modem-manager/nm-modem-gsm.h
+++ b/src/modem-manager/nm-modem-gsm.h
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define NM_TYPE_MODEM_GSM (nm_modem_gsm_get_type ())
-#define NM_MODEM_GSM(obj) (G_TYPE_CHECK_INSTANCE_CAST
((obj), NM_TYPE_MODEM_GSM, NMModemGsm))
-#define NM_MODEM_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM_GSM, NMModemGsmClass))
-#define NM_IS_MODEM_GSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM_GSM))
+#define NM_TYPE_MODEM_GSM (nm_modem_gsm_get_type ())
+#define NM_MODEM_GSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NM_TYPE_MODEM_GSM, NMModemGsm))
+#define NM_MODEM_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM_GSM, NMModemGsmClass))
+#define NM_IS_MODEM_GSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM_GSM))
#define NM_IS_MODEM_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
NM_TYPE_MODEM_GSM))
-#define NM_MODEM_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
NM_TYPE_MODEM_GSM, NMModemGsmClass))
+#define NM_MODEM_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
NM_TYPE_MODEM_GSM, NMModemGsmClass))
typedef enum {
NM_GSM_ERROR_CONNECTION_NOT_GSM = 0, /*< nick=ConnectionNotGsm >*/
diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c
index 5ce7ff7..db5d4ee 100644
--- a/src/modem-manager/nm-modem.c
+++ b/src/modem-manager/nm-modem.c
@@ -236,14 +236,14 @@ ppp_stage3_ip4_config_start (NMModem *self,
priv->ppp_manager = nm_ppp_manager_new (priv->data_port);
if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, ip_timeout,
&error)) {
g_signal_connect (priv->ppp_manager, "state-changed",
- G_CALLBACK
(ppp_state_changed),
- self);
+ G_CALLBACK (ppp_state_changed),
+ self);
g_signal_connect (priv->ppp_manager, "ip4-config",
- G_CALLBACK (ppp_ip4_config),
- self);
+ G_CALLBACK (ppp_ip4_config),
+ self);
g_signal_connect (priv->ppp_manager, "stats",
- G_CALLBACK (ppp_stats),
- self);
+ G_CALLBACK (ppp_stats),
+ self);
ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else {
@@ -647,8 +647,8 @@ constructor (GType type,
NMModemPrivate *priv;
object = G_OBJECT_CLASS (nm_modem_parent_class)->constructor (type,
-
n_construct_params,
-
construct_params);
+
n_construct_params,
+
construct_params);
if (!object)
return NULL;
@@ -673,7 +673,7 @@ constructor (GType type,
static void
get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+ GValue *value, GParamSpec *pspec)
{
NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
@@ -710,7 +710,7 @@ get_property (GObject *object, guint prop_id,
static void
set_property (GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
+ const GValue *value, GParamSpec *pspec)
{
NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
@@ -803,10 +803,10 @@ nm_modem_class_init (NMModemClass *klass)
g_object_class_install_property
(object_class, PROP_PATH,
g_param_spec_string (NM_MODEM_PATH,
- "DBus path",
- "DBus path",
- NULL,
- G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
+ "DBus path",
+ "DBus path",
+ NULL,
+ G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_CONTROL_PORT,
@@ -827,12 +827,12 @@ nm_modem_class_init (NMModemClass *klass)
g_object_class_install_property
(object_class, PROP_IP_METHOD,
g_param_spec_uint (NM_MODEM_IP_METHOD,
- "IP method",
- "IP method",
- MM_MODEM_IP_METHOD_PPP,
- MM_MODEM_IP_METHOD_DHCP,
- MM_MODEM_IP_METHOD_PPP,
- G_PARAM_READWRITE));
+ "IP method",
+ "IP method",
+ MM_MODEM_IP_METHOD_PPP,
+ MM_MODEM_IP_METHOD_DHCP,
+ MM_MODEM_IP_METHOD_PPP,
+ G_PARAM_READWRITE));
g_object_class_install_property
(object_class, PROP_IP_TIMEOUT,
@@ -862,56 +862,56 @@ nm_modem_class_init (NMModemClass *klass)
signals[PPP_STATS] =
g_signal_new ("ppp-stats",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
ppp_stats),
- NULL, NULL,
- _nm_marshal_VOID__UINT_UINT,
- G_TYPE_NONE, 2,
- G_TYPE_UINT, G_TYPE_UINT);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, ppp_stats),
+ NULL, NULL,
+ _nm_marshal_VOID__UINT_UINT,
+ G_TYPE_NONE, 2,
+ G_TYPE_UINT, G_TYPE_UINT);
signals[PPP_FAILED] =
g_signal_new ("ppp-failed",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
ppp_failed),
- NULL, NULL,
- g_cclosure_marshal_VOID__UINT,
- G_TYPE_NONE, 1, G_TYPE_UINT);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, ppp_failed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__UINT,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
signals[IP4_CONFIG_RESULT] =
g_signal_new (NM_MODEM_IP4_CONFIG_RESULT,
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
ip4_config_result),
- NULL, NULL,
-
_nm_marshal_VOID__STRING_OBJECT_POINTER,
- G_TYPE_NONE, 3, G_TYPE_STRING,
G_TYPE_OBJECT, G_TYPE_POINTER);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, ip4_config_result),
+ NULL, NULL,
+ _nm_marshal_VOID__STRING_OBJECT_POINTER,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_OBJECT,
G_TYPE_POINTER);
signals[PREPARE_RESULT] =
g_signal_new (NM_MODEM_PREPARE_RESULT,
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
prepare_result),
- NULL, NULL,
- _nm_marshal_VOID__BOOLEAN_UINT,
- G_TYPE_NONE, 2, G_TYPE_BOOLEAN,
G_TYPE_UINT);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, prepare_result),
+ NULL, NULL,
+ _nm_marshal_VOID__BOOLEAN_UINT,
+ G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_UINT);
signals[AUTH_REQUESTED] =
g_signal_new (NM_MODEM_AUTH_REQUESTED,
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
auth_requested),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, auth_requested),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[AUTH_RESULT] =
g_signal_new (NM_MODEM_AUTH_RESULT,
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (NMModemClass,
auth_result),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1, G_TYPE_POINTER);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMModemClass, auth_result),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
}
diff --git a/src/modem-manager/nm-modem.h b/src/modem-manager/nm-modem.h
index fb07a8e..c42f449 100644
--- a/src/modem-manager/nm-modem.h
+++ b/src/modem-manager/nm-modem.h
@@ -29,12 +29,12 @@
G_BEGIN_DECLS
-#define NM_TYPE_MODEM (nm_modem_get_type ())
-#define NM_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NM_TYPE_MODEM, NMModem))
-#define NM_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM, NMModemClass))
-#define NM_IS_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM))
-#define NM_IS_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
NM_TYPE_MODEM))
-#define NM_MODEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
NM_TYPE_MODEM, NMModemClass))
+#define NM_TYPE_MODEM (nm_modem_get_type ())
+#define NM_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NM_TYPE_MODEM, NMModem))
+#define NM_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
NM_TYPE_MODEM, NMModemClass))
+#define NM_IS_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
NM_TYPE_MODEM))
+#define NM_IS_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
NM_TYPE_MODEM))
+#define NM_MODEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
NM_TYPE_MODEM, NMModemClass))
#define NM_MODEM_UID "uid"
#define NM_MODEM_PATH "path"
--
1.7.11.7
_______________________________________________
networkmanager-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/networkmanager-list
