colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: remove `--connect-with-number' option, no longer needed

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-19 15:30:45 +01:00
parent 98d7edadb5
commit 22846fc46f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cli/mmcli-bearer.c
View File

@@ -44,19 +44,14 @@ static Context *ctx;
/* Options */ /* Options */
static gboolean info_flag; /* set when no action found */ static gboolean info_flag; /* set when no action found */
static gchar *connect_with_number_str;
static gboolean connect_flag; static gboolean connect_flag;
static gboolean disconnect_flag; static gboolean disconnect_flag;
static GOptionEntry entries[] = { static GOptionEntry entries[] = {
{ "connect", 'c', 0, G_OPTION_ARG_NONE, &connect_flag, { "connect", 'c', 0, G_OPTION_ARG_NONE, &connect_flag,
"Connect a given bearer using the default number, if any.", "Connect a given bearer.",
NULL NULL
}, },
{ "connect-with-number", 0, 0, G_OPTION_ARG_STRING, &connect_with_number_str,
"Connect a given bearer using the specified number.",
"[NUMBER]"
},
{ "disconnect", 'x', 0, G_OPTION_ARG_NONE, &disconnect_flag, { "disconnect", 'x', 0, G_OPTION_ARG_NONE, &disconnect_flag,
"Disconnect a given bearer.", "Disconnect a given bearer.",
NULL NULL
@@ -89,8 +84,7 @@ mmcli_bearer_options_enabled (void)
if (checked) if (checked)
return !!n_actions; return !!n_actions;
n_actions = (!!connect_with_number_str + n_actions = (connect_flag +
connect_flag +
disconnect_flag); disconnect_flag);
if (n_actions == 0 && mmcli_get_common_bearer_string ()) { if (n_actions == 0 && mmcli_get_common_bearer_string ()) {
@@ -302,10 +296,9 @@ get_bearer_ready (GObject *source,
g_assert_not_reached (); g_assert_not_reached ();
/* Request to connect the bearer? */ /* Request to connect the bearer? */
if (connect_flag || connect_with_number_str) { if (connect_flag) {
g_debug ("Asynchronously connecting bearer..."); g_debug ("Asynchronously connecting bearer...");
mm_bearer_connect (ctx->bearer, mm_bearer_connect (ctx->bearer,
connect_flag ? "" : connect_with_number_str,
ctx->cancellable, ctx->cancellable,
(GAsyncReadyCallback)connect_ready, (GAsyncReadyCallback)connect_ready,
NULL); NULL);
@@ -362,12 +355,11 @@ mmcli_bearer_run_synchronous (GDBusConnection *connection)
} }
/* Request to connect the bearer? */ /* Request to connect the bearer? */
if (connect_flag || connect_with_number_str) { if (connect_flag) {
gboolean result; gboolean result;
g_debug ("Synchronously connecting bearer..."); g_debug ("Synchronously connecting bearer...");
result = mm_bearer_connect_sync (ctx->bearer, result = mm_bearer_connect_sync (ctx->bearer,
connect_flag ? "" : connect_with_number_str,
NULL, NULL,
&error); &error);
connect_process_reply (result, error); connect_process_reply (result, error);