diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:57 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:57 +0200 |
| commit | 3241555aff5c969104e492501097f4cb8837bcca (patch) | |
| tree | 6d15a02d02a9f1bfcda6075ae2b8c71537d8038d /cli/src | |
| parent | e1b66c145e71e7bc6a06845dd17788fb7b8e158e (diff) | |
| parent | 9f806e97a24bba61417ae312fcc0da40914266fb (diff) | |
Merge commit 'upstream/0.8.999' into experimental
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/Makefile.in | 7 | ||||
| -rw-r--r-- | cli/src/network-manager.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index f5a9e00b..e4708ad1 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -114,6 +114,10 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -231,6 +235,8 @@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ +QT_CFLAGS = @QT_CFLAGS@ +QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ @@ -252,6 +258,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c index 5ecfde3a..ac9a3841 100644 --- a/cli/src/network-manager.c +++ b/cli/src/network-manager.c @@ -189,7 +189,7 @@ show_nm_status (NmCli *nmc) print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ nmc->allowed_fields[0].value = nm_running ? _("running") : _("not running"); - nmc->allowed_fields[1].value = nm_client_get_version (nmc->client); + nmc->allowed_fields[1].value = nm_running ? nm_client_get_version (nmc->client) : _("unknown"); nmc->allowed_fields[2].value = nm_state_to_string (state); nmc->allowed_fields[3].value = net_enabled_str; nmc->allowed_fields[4].value = wireless_hw_enabled_str; |