[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix #4969
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix #4969 |
Date: |
Sat, 25 Mar 2017 21:13:20 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 8d8de6b9 fix #4969
8d8de6b9 is described below
commit 8d8de6b9c5812226d773149c9376fbbf7783b36e
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Mar 25 21:13:17 2017 +0100
fix #4969
---
m4/ltsugar.m4 | 7 ++++---
src/conversation/gnunet-conversation-gtk.c | 18 +++++++++++-------
src/peerinfo/gnunet-peerinfo-gtk.c | 9 +++++----
src/setup/gnunet-setup.c | 9 +++++----
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a057..48bc9344 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/src/conversation/gnunet-conversation-gtk.c
b/src/conversation/gnunet-conversation-gtk.c
index be4f07db..b004abaa 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -171,13 +171,17 @@ run (void *cls)
int
main (int argc, char *const *argv)
{
- static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'p', "phone", "LINE",
- gettext_noop ("sets the LINE to use for the phone"),
- 1, &GNUNET_GETOPT_set_uint, &line},
- {'e', "ego", "ego",
- gettext_noop ("select ego to use"), 1,
- &GNUNET_GETOPT_set_string, &ego_name},
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_SET_UINT ('p',
+ "phone",
+ "LINE",
+ gettext_noop ("sets the LINE to use for the
phone"),
+ &line),
+ GNUNET_GETOPT_OPTION_STRING ('e',
+ "ego",
+ "EGO",
+ gettext_noop ("select ego to use"),
+ &ego_name),
GNUNET_GETOPT_OPTION_END
};
int ret;
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c
b/src/peerinfo/gnunet-peerinfo-gtk.c
index 2eaf102c..951f7fc8 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -1548,10 +1548,11 @@ run (void *cts)
int
main (int argc, char **argv)
{
- static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'s', "show-inactive", NULL,
- gettext_noop ("show peers even if the are inactive and we know nothing
except their public key"), 0,
- &GNUNET_GETOPT_set_one, &show_inactive},
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_SET_ONE ('s',
+ "show-inactive",
+ gettext_noop ("show peers even if the are
inactive and we know nothing except their public key"),
+ &show_inactive),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index ac37a972..74bf2fe4 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2010, 2011, 2012, 2013 GNUnet e.V.
+ Copyright (C) 2010, 2011, 2012, 2013, 2017 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -519,9 +519,10 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
#ifndef MINGW
- { 'e', "elevate-priviledges", NULL,
- gettext_noop ("run as user 'gnunet', if necessary by executing gksu to
elevate rights"),
- 0, &GNUNET_GETOPT_set_one, &do_gksu },
+ GNUNET_GETOPT_OPTION_SET_ONE ('e',
+ "elevate-priviledges",
+ gettext_noop ("run as user 'gnunet', if
necessary by executing gksu to elevate rights"),
+ &do_gksu),
#endif
GNUNET_GETOPT_OPTION_END
};
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet-gtk] branch master updated: fix #4969,
gnunet <=