diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-30 13:29:55 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-30 13:43:03 +0200 |
| commit | 36e5c0a821a690e5429536766b8a9e034d96b95f (patch) | |
| tree | 5c5040f74c106bb09b9f416d292d1b3ddc8a3691 | |
| parent | 3227778d89843df43717f41fff3bc8b87ff0d370 (diff) | |
| download | NetworkManager-36e5c0a821a690e5429536766b8a9e034d96b95f.tar.gz | |
all: g_hash_table_add doesn't return a value before 2.40
| -rw-r--r-- | src/nm-bus-manager.c | 4 | ||||
| -rw-r--r-- | src/nm-firewall-manager.c | 4 | ||||
| -rw-r--r-- | src/settings/nm-agent-manager.c | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index 4f6ad24376..3b8f672aef 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -873,8 +873,12 @@ 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)) g_return_if_reached (); +#else + g_hash_table_insert (priv->exported, (gpointer) path, object); +#endif nm_assert_exported (self, path, object); diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 6572d1651f..ab8598a0a8 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -163,8 +163,12 @@ _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)) g_return_val_if_reached (NULL); +#else + g_hash_table_add (priv->pending_calls, info); +#endif return info; } diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 0c36d286f2..aa05354e06 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -1216,8 +1216,12 @@ 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)) 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)) @@ -1322,8 +1326,12 @@ 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)) g_assert_not_reached (); +#else + g_hash_table_add (priv->requests, req); +#endif /* Kick off the request */ request_add_agents (self, req); @@ -1410,8 +1418,12 @@ 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)) g_assert_not_reached (); +#else + g_hash_table_add (priv->requests, req); +#endif /* Kick off the request */ request_add_agents (self, req); |