colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: avoid g_object_notify() in favor of _notify()

Browse Source 
This looks up the GParamSpec from the obj_properties and is
thus more efficient. Also, the generated _notify() function
has the proper argument type and is thus generally preferable.
This commit is contained in:
Thomas Haller
2019-10-17 10:47:29 +02:00
parent e761d230c3
commit 15cc1d8770
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm/nm-active-connection.c
View File

@@ -47,7 +47,7 @@ typedef struct {
NMActiveConnectionStateReason reason; NMActiveConnectionStateReason reason;
} NMActiveConnectionPrivate; } NMActiveConnectionPrivate;
NM_GOBJECT_PROPERTIES_DEFINE_BASE ( NM_GOBJECT_PROPERTIES_DEFINE (NMActiveConnection,
PROP_CONNECTION, PROP_CONNECTION,
PROP_ID, PROP_ID,
PROP_UUID, PROP_UUID,
@@ -392,7 +392,7 @@ state_changed_proxy (NMDBusActiveConnectionProxy *proxy,
priv->state = state; priv->state = state;
priv->reason = reason; priv->reason = reason;
g_signal_emit (connection, signals[STATE_CHANGED], 0, state, reason); g_signal_emit (connection, signals[STATE_CHANGED], 0, state, reason);
g_object_notify (G_OBJECT (connection), NM_ACTIVE_CONNECTION_STATE); _notify (connection, PROP_STATE);
} }
static void static void

2
libnm/nm-client.c
View File

@@ -3461,7 +3461,7 @@ new_object_manager (GObject *source_object, GAsyncResult *res, gpointer user_dat
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self);
g_clear_object (&priv->new_object_manager_cancellable); g_clear_object (&priv->new_object_manager_cancellable);
g_object_notify (G_OBJECT (user_data), NM_CLIENT_NM_RUNNING); _notify (user_data, PROP_NM_RUNNING);
} }
static void static void

4
libnm/nm-manager.c
View File

@@ -75,7 +75,7 @@ typedef struct {
gboolean connectivity_check_enabled; gboolean connectivity_check_enabled;
} NMManagerPrivate; } NMManagerPrivate;
NM_GOBJECT_PROPERTIES_DEFINE_BASE ( NM_GOBJECT_PROPERTIES_DEFINE (NMManager,
PROP_VERSION, PROP_VERSION,
PROP_STATE, PROP_STATE,
PROP_STARTUP, PROP_STARTUP,
@@ -631,7 +631,7 @@ _nm_manager_set_connectivity_hack (NMManager *manager,
if ((NMConnectivityState) connectivity != priv->connectivity) { if ((NMConnectivityState) connectivity != priv->connectivity) {
priv->connectivity = (NMConnectivityState) connectivity; priv->connectivity = (NMConnectivityState) connectivity;
g_object_notify (G_OBJECT (manager), NM_MANAGER_CONNECTIVITY); _notify (manager, PROP_CONNECTIVITY);
} }
} }

4
libnm/nm-remote-connection.c
View File

@@ -39,7 +39,7 @@ G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_OBJEC
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, nm_remote_connection_async_initable_iface_init); G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, nm_remote_connection_async_initable_iface_init);
) )
NM_GOBJECT_PROPERTIES_DEFINE_BASE ( NM_GOBJECT_PROPERTIES_DEFINE (NMRemoteConnection,
PROP_UNSAVED, PROP_UNSAVED,
PROP_FLAGS, PROP_FLAGS,
PROP_FILENAME, PROP_FILENAME,
@@ -657,7 +657,7 @@ updated_get_settings_cb (GObject *proxy,
if (visible != priv->visible) { if (visible != priv->visible) {
priv->visible = visible; priv->visible = visible;
g_object_notify (G_OBJECT (self), NM_REMOTE_CONNECTION_VISIBLE); _notify (self, PROP_VISIBLE);
} }
g_object_unref (self); g_object_unref (self);

4
libnm/nm-vpn-connection.c
View File

@@ -27,7 +27,7 @@ typedef struct {
NMVpnConnectionState vpn_state; NMVpnConnectionState vpn_state;
} NMVpnConnectionPrivate; } NMVpnConnectionPrivate;
NM_GOBJECT_PROPERTIES_DEFINE_BASE ( NM_GOBJECT_PROPERTIES_DEFINE (NMVpnConnection,
PROP_VPN_STATE, PROP_VPN_STATE,
PROP_BANNER, PROP_BANNER,
); );
@@ -85,7 +85,7 @@ vpn_state_changed_proxy (NMDBusVpnConnection *proxy,
if (priv->vpn_state != vpn_state) { if (priv->vpn_state != vpn_state) {
priv->vpn_state = vpn_state; priv->vpn_state = vpn_state;
g_signal_emit (connection, signals[VPN_STATE_CHANGED], 0, vpn_state, reason); g_signal_emit (connection, signals[VPN_STATE_CHANGED], 0, vpn_state, reason);
g_object_notify (G_OBJECT (connection), NM_VPN_CONNECTION_VPN_STATE); _notify (connection, PROP_VPN_STATE);
} }
} }