diff options
author | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
---|---|---|
committer | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
commit | aa98f144e6db0da5a0a4cad83fe64a80bbab6692 (patch) | |
tree | 5a072b4e1b689bf4330b2a412bdadc705d33ff75 /src/conversation/gnunet-conversation.c | |
parent | caeeec6cacaa5354883494cb64b0a38e5c75da5d (diff) | |
parent | b424335cc632a11bd76bad5791cef10e8c985720 (diff) | |
download | gnunet-aa98f144e6db0da5a0a4cad83fe64a80bbab6692.tar.gz gnunet-aa98f144e6db0da5a0a4cad83fe64a80bbab6692.zip |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'src/conversation/gnunet-conversation.c')
-rw-r--r-- | src/conversation/gnunet-conversation.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 925db4665..c5275c0de 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -1265,13 +1265,20 @@ run (void *cls, | |||
1265 | int | 1265 | int |
1266 | main (int argc, char *const *argv) | 1266 | main (int argc, char *const *argv) |
1267 | { | 1267 | { |
1268 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | 1268 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
1269 | {'e', "ego", "NAME", | 1269 | |
1270 | gettext_noop ("sets the NAME of the ego to use for the phone (and name resolution)"), | 1270 | GNUNET_GETOPT_OPTION_STRING ('e', |
1271 | 1, &GNUNET_GETOPT_set_string, &ego_name}, | 1271 | "ego", |
1272 | {'p', "phone", "LINE", | 1272 | "NAME", |
1273 | gettext_noop ("sets the LINE to use for the phone"), | 1273 | gettext_noop ("sets the NAME of the ego to use for the phone (and name resolution)"), |
1274 | 1, &GNUNET_GETOPT_set_string, &line}, | 1274 | &ego_name), |
1275 | |||
1276 | GNUNET_GETOPT_OPTION_STRING ('p', | ||
1277 | "phone", | ||
1278 | "LINE", | ||
1279 | gettext_noop ("sets the LINE to use for the phone"), | ||
1280 | &line), | ||
1281 | |||
1275 | GNUNET_GETOPT_OPTION_END | 1282 | GNUNET_GETOPT_OPTION_END |
1276 | }; | 1283 | }; |
1277 | int ret; | 1284 | int ret; |