diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /src/ppp/nm-ppp-manager.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/ppp/nm-ppp-manager.c')
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index f649e0cb..751ec28b 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -41,7 +41,8 @@ #define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so" -static NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark) +static +NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark) /*****************************************************************************/ @@ -664,7 +665,8 @@ out: /*****************************************************************************/ -NM_UTILS_LOOKUP_STR_DEFINE_STATIC (pppd_exit_code_to_str, int, +static +NM_UTILS_LOOKUP_STR_DEFINE (pppd_exit_code_to_str, int, NM_UTILS_LOOKUP_DEFAULT ("Unknown error"), NM_UTILS_LOOKUP_STR_ITEM ( 1, "Fatal pppd error"); NM_UTILS_LOOKUP_STR_ITEM ( 2, "pppd options error"), @@ -1259,7 +1261,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); switch (prop_id) { case PROP_PARENT_IFACE: @@ -1275,7 +1277,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); switch (prop_id) { case PROP_PARENT_IFACE: @@ -1333,7 +1335,7 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); g_free (priv->parent_iface); |