diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:00:09 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:06:47 +0200 |
| commit | b7db94545968c37886b7111d8c85f62eb063fbb4 (patch) | |
| tree | 7c2aedd497b1fdcb26bf9d49f98cc63a530baf2e /libnm-core/nm-utils.h | |
| parent | 9d5cdc3adde9e7e57bf5a0e754e563b6a9e8e513 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Import Debian changes 1.12.2-0ubuntu3
network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
* debian/rules:
- use --with-libnm-glib, the default reversed since that's a legacy
library but we still need it for unity-control-center
network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
* debian/patches/git-newglib-test.patch:
- backport upstream commit to fix the tests with the new glib
network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
* New upstream version
* d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
d/p/git_thunderbolt_connect.patch:
- removed, those changes are in the new version
* Backport Debian changes
* Update symbols file for libnm0
* Enable iwd support
* Drop version requirements when oldstable ships a newer version
* Drop dh_strip override, the dbgsym migration is done
* Rebase patches
* Make sure the example server.conf is actually installed
* Update install path for plugins, it now includes a version number
* Drop libnl3 build dependency.
Upstream has copied the code directly from libnl3 for the few functions it
needs with a few small modifications.
* Drop libiw build dependency.
Hasn't been needed for a long time and was simply a left over from older
releases.
* Bump Standards-Version to 4.1.5
* Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
Diffstat (limited to 'libnm-core/nm-utils.h')
| -rw-r--r-- | libnm-core/nm-utils.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index df9284b3..70245869 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -233,21 +233,26 @@ char * nm_utils_format_variant_attributes (GHashTable *attributes, /*****************************************************************************/ -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCQdisc *nm_utils_tc_qdisc_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_qdisc_to_str (NMTCQdisc *qdisc, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCAction *nm_utils_tc_action_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_action_to_str (NMTCAction *action, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCTfilter *nm_utils_tc_tfilter_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_tfilter_to_str (NMTCTfilter *tfilter, GError **error); +/*****************************************************************************/ + +NM_AVAILABLE_IN_1_12 +gint64 nm_utils_get_timestamp_msec (void); + G_END_DECLS #endif /* __NM_UTILS_H__ */ |