main/trivial: change order of arguments for nm_main_utils_early_setup()

Change the order of the argv and argc argument to match
the main() function.

(cherry picked from commit ee4543bd6e)
This commit is contained in:
Thomas Haller 2015-03-13 20:47:03 +01:00
parent 2d9befcb41
commit 126723f94d
4 changed files with 4 additions and 4 deletions

View file

@ -216,8 +216,8 @@ done:
gboolean
nm_main_utils_early_setup (const char *progname,
char **argv[],
int *argc,
char **argv[],
GOptionEntry *options,
GOptionEntry *more_options,
const char *summary)

View file

@ -30,8 +30,8 @@ gboolean nm_main_utils_write_pidfile (const char *pidfile);
gboolean nm_main_utils_check_pidfile (const char *pidfile, const char *name);
gboolean nm_main_utils_early_setup (const char *progname,
char **argv[],
int *argc,
char **argv[],
GOptionEntry *options,
GOptionEntry *more_options,
const char *summary);

View file

@ -237,8 +237,8 @@ main (int argc, char *argv[])
main_loop = g_main_loop_new (NULL, FALSE);
if (!nm_main_utils_early_setup ("NetworkManager",
&argv,
&argc,
&argv,
options,
nm_config_get_options (),
_("NetworkManager monitors all network connections and automatically\nchooses the best connection to use. It also allows the user to\nspecify wireless access points which wireless cards in the computer\nshould associate with.")))

View file

@ -321,8 +321,8 @@ main (int argc, char *argv[])
setpgid (getpid (), getpid ());
if (!nm_main_utils_early_setup ("nm-iface-helper",
&argv,
&argc,
&argv,
options,
NULL,
_("nm-iface-helper is a small, standalone process that manages a single network interface.")))