system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-03 06:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: use glib compatibility functions for g_hash_table_add() and g_hash_table_insert()

Browse source
This commit is contained in:
Thomas Haller 2015-09-30 14:08:50 +02:00
parent 261dff429e
commit a9b1869d63
3 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-bus-manager.c
View file

@ -873,12 +873,8 @@ nm_bus_manager_register_object (NMBusManager *self,
* stable -- because the path is the identifier for the object in this
* situation. */
#if GLIB_CHECK_VERSION(2, 40, 0)
if (!g_hash_table_insert (priv->exported, (gpointer) path, object))
if (!nm_g_hash_table_insert (priv->exported, (gpointer) path, object))
g_return_if_reached ();
#else
g_hash_table_insert (priv->exported, (gpointer) path, object);
#endif
nm_assert_exported (self, path, object);

6
src/nm-firewall-manager.c
View file

@ -163,12 +163,8 @@ _cb_info_create (NMFirewallManager *self,
} else
info->mode = CB_INFO_MODE_IDLE;
#if GLIB_CHECK_VERSION(2, 40, 0)
if (!g_hash_table_add (priv->pending_calls, info))
if (!nm_g_hash_table_add (priv->pending_calls, info))
g_return_val_if_reached (NULL);
#else
g_hash_table_add (priv->pending_calls, info);
#endif
return info;
}

18
src/settings/nm-agent-manager.c
View file

@ -1216,12 +1216,8 @@ nm_agent_manager_get_secrets (NMAgentManager *self,
req->con.get.callback = callback;
req->con.get.callback_data = callback_data;
#if GLIB_CHECK_VERSION(2, 40, 0)
if (!g_hash_table_add (priv->requests, req))
if (!nm_g_hash_table_add (priv->requests, req))
g_assert_not_reached ();
#else
g_hash_table_add (priv->requests, req);
#endif
/* Kick off the request */
if (!(req->con.get.flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM))
@ -1326,12 +1322,8 @@ nm_agent_manager_save_secrets (NMAgentManager *self,
subject);
req->con.path = g_strdup (path);
req->con.connection = g_object_ref (connection);
#if GLIB_CHECK_VERSION(2, 40, 0)
if (!g_hash_table_add (priv->requests, req))
if (!nm_g_hash_table_add (priv->requests, req))
g_assert_not_reached ();
#else
g_hash_table_add (priv->requests, req);
#endif
/* Kick off the request */
request_add_agents (self, req);
@ -1418,12 +1410,8 @@ nm_agent_manager_delete_secrets (NMAgentManager *self,
req->con.path = g_strdup (path);
req->con.connection = g_object_ref (connection);
g_object_unref (subject);
#if GLIB_CHECK_VERSION(2, 40, 0)
if (!g_hash_table_add (priv->requests, req))
if (!nm_g_hash_table_add (priv->requests, req))
g_assert_not_reached ();
#else
g_hash_table_add (priv->requests, req);
#endif
/* Kick off the request */
request_add_agents (self, req);