bearer: remove allow-roaming, only meaningful in the broadband bearer
This commit is contained in:
@@ -43,7 +43,6 @@ enum {
|
||||
PROP_MODEM,
|
||||
PROP_CONNECTION_FORBIDDEN_REASON,
|
||||
PROP_STATUS,
|
||||
PROP_ALLOW_ROAMING,
|
||||
PROP_LAST
|
||||
};
|
||||
|
||||
@@ -60,8 +59,6 @@ struct _MMBearerPrivate {
|
||||
MMBearerConnectionForbiddenReason connection_forbidden_reason;
|
||||
/* Status of this bearer */
|
||||
MMBearerStatus status;
|
||||
/* Flag to allow/forbid connections while roaming */
|
||||
gboolean allow_roaming;
|
||||
|
||||
/* Cancellable for connect() */
|
||||
GCancellable *connect_cancellable;
|
||||
@@ -465,12 +462,6 @@ mm_bearer_get_status (MMBearer *self)
|
||||
return self->priv->status;
|
||||
}
|
||||
|
||||
gboolean
|
||||
mm_bearer_get_allow_roaming (MMBearer *self)
|
||||
{
|
||||
return self->priv->allow_roaming;
|
||||
}
|
||||
|
||||
const gchar *
|
||||
mm_bearer_get_path (MMBearer *self)
|
||||
{
|
||||
@@ -600,9 +591,6 @@ set_property (GObject *object,
|
||||
case PROP_STATUS:
|
||||
self->priv->status = g_value_get_enum (value);
|
||||
break;
|
||||
case PROP_ALLOW_ROAMING:
|
||||
self->priv->allow_roaming = g_value_get_boolean (value);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -633,9 +621,6 @@ get_property (GObject *object,
|
||||
case PROP_STATUS:
|
||||
g_value_set_enum (value, self->priv->status);
|
||||
break;
|
||||
case PROP_ALLOW_ROAMING:
|
||||
g_value_set_boolean (value, self->priv->allow_roaming);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -650,7 +635,6 @@ mm_bearer_init (MMBearer *self)
|
||||
MM_TYPE_BEARER,
|
||||
MMBearerPrivate);
|
||||
self->priv->status = MM_BEARER_STATUS_DISCONNECTED;
|
||||
self->priv->allow_roaming = TRUE;
|
||||
self->priv->connection_forbidden_reason = MM_BEARER_CONNECTION_FORBIDDEN_REASON_UNREGISTERED;
|
||||
|
||||
/* Set defaults */
|
||||
@@ -742,12 +726,4 @@ mm_bearer_class_init (MMBearerClass *klass)
|
||||
MM_BEARER_STATUS_DISCONNECTED,
|
||||
G_PARAM_READWRITE);
|
||||
g_object_class_install_property (object_class, PROP_STATUS, properties[PROP_STATUS]);
|
||||
|
||||
properties[PROP_ALLOW_ROAMING] =
|
||||
g_param_spec_boolean (MM_BEARER_ALLOW_ROAMING,
|
||||
"Allow roaming",
|
||||
"Whether connections are allowed when roaming",
|
||||
TRUE,
|
||||
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
|
||||
g_object_class_install_property (object_class, PROP_ALLOW_ROAMING, properties[PROP_ALLOW_ROAMING]);
|
||||
}
|
||||
|
||||
@@ -41,7 +41,6 @@ typedef struct _MMBearerPrivate MMBearerPrivate;
|
||||
#define MM_BEARER_MODEM "bearer-modem"
|
||||
#define MM_BEARER_CONNECTION_FORBIDDEN_REASON "bearer-connection-forbidden-reason"
|
||||
#define MM_BEARER_STATUS "bearer-status"
|
||||
#define MM_BEARER_ALLOW_ROAMING "bearer-allow-roaming"
|
||||
|
||||
/* Prefix for all bearer object paths */
|
||||
#define MM_DBUS_BEARER_PREFIX MM_DBUS_PATH "/Bearers"
|
||||
@@ -100,8 +99,6 @@ void mm_bearer_set_connection_forbidden (MMBearer *bearer,
|
||||
|
||||
MMBearerStatus mm_bearer_get_status (MMBearer *bearer);
|
||||
|
||||
gboolean mm_bearer_get_allow_roaming (MMBearer *self);
|
||||
|
||||
void mm_bearer_connect (MMBearer *self,
|
||||
const gchar *number,
|
||||
GAsyncReadyCallback callback,
|
||||
|
||||
Reference in New Issue
Block a user