From 4c23ac3c6c3f7f8339a3e93ab3c62e33ccbd5bdf Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 27 Aug 2010 12:39:47 -0500 Subject: [PATCH] settings: remove some unused code priv->access_list is allocated during object initialization and only destroyed when the object is destroyed, so it will always be valid over the lifetime of the object. Thus no need to check if it exists or not. --- src/system-settings/nm-sysconfig-connection.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/system-settings/nm-sysconfig-connection.c b/src/system-settings/nm-sysconfig-connection.c index 0eeb81f524..87798c29da 100644 --- a/src/system-settings/nm-sysconfig-connection.c +++ b/src/system-settings/nm-sysconfig-connection.c @@ -210,9 +210,6 @@ update_access_list (NMSysconfigConnection *self) NMSessionManager *session_manager = nm_session_manager_get (); GSList *sessions, *iter; - if (!priv->access_list) - return; - g_hash_table_remove_all (priv->access_list); sessions = nm_session_manager_get_sessions (session_manager); for (iter = sessions; iter != NULL; iter = iter->next) { @@ -256,9 +253,7 @@ nm_sysconfig_connection_get_session_access_list (NMSysconfigConnection *connecti NMSysconfigConnectionPrivate *priv = NM_SYSCONFIG_CONNECTION_GET_PRIVATE (connection); GSList *sessions = NULL; - if (priv->access_list) - g_hash_table_foreach (priv->access_list, prepend_slist, &sessions); - + g_hash_table_foreach (priv->access_list, prepend_slist, &sessions); return sessions; } @@ -272,9 +267,6 @@ nm_sysconfig_connection_is_accessible_by_session (NMSysconfigConnection *connect g_return_val_if_fail (NM_IS_SYSCONFIG_CONNECTION (connection), FALSE); g_return_val_if_fail (NM_IS_SESSION_INFO (session), FALSE); - if (!priv->access_list) - return FALSE; - stored_session = g_hash_table_lookup (priv->access_list, nm_session_info_get_id (session));