Use the new typed nm_connection_get_setting_*() methods

12 files changed, 37 insertions, 40 deletions

diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 743b4d27..3e9a2141 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -93,7 +93,7 @@ nm_connection_editor_update_title (NMConnectionEditor *editor)
 
 	g_return_if_fail (editor != NULL);
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (editor->connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (editor->connection);
 	g_assert (s_con);
 
 	id = nm_setting_connection_get_id (s_con);
@@ -154,7 +154,7 @@ update_sensitivity (NMConnectionEditor *editor)
 	GtkWidget *widget;
 	GSList *iter;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (editor->connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (editor->connection);
 
 	/* Can't modify read-only connections; can't modify anything before the
 	 * editor is initialized either.
@@ -205,7 +205,7 @@ connection_editor_validate (NMConnectionEditor *editor)
 	if (!editor_is_initialized (editor))
 		goto done;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (editor->connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (editor->connection);
 	g_assert (s_con);
 	if (nm_setting_connection_get_read_only (s_con))
 		goto done;
@@ -504,7 +504,7 @@ populate_connection_ui (NMConnectionEditor *editor)
 	name = GTK_WIDGET (gtk_builder_get_object (editor->builder, "connection_name"));
 	autoconnect = GTK_WIDGET (gtk_builder_get_object (editor->builder, "connection_autoconnect"));
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (editor->connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (editor->connection);
 	if (s_con) {
 		const char *id = nm_setting_connection_get_id (s_con);
 
@@ -722,7 +722,7 @@ nm_connection_editor_set_connection (NMConnectionEditor *editor,
 	editor->orig_connection = g_object_ref (orig_connection);
 	nm_connection_editor_update_title (editor);
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (editor->connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (editor->connection);
 	g_assert (s_con);
 
 	connection_type = nm_setting_connection_get_connection_type (s_con);
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index ae0296c7..455334d0 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -157,7 +157,7 @@ get_model_for_connection (NMConnectionList *list, NMRemoteConnection *connection
 	GtkTreeModel *model;
 	const char *str_type;
 
-	s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION);
+	s_con = nm_connection_get_setting_connection (NM_CONNECTION (connection));
 	g_assert (s_con);
 	str_type = nm_setting_connection_get_connection_type (s_con);
 
@@ -285,7 +285,7 @@ update_connection_row (GtkListStore *store,
 	NMSettingConnection *s_con;
 	char *last_used;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (NM_CONNECTION (connection));
 	g_assert (s_con);
 
 	last_used = format_last_used (nm_setting_connection_get_timestamp (s_con));
@@ -784,7 +784,7 @@ delete_clicked (GtkButton *button, gpointer user_data)
 		return;
 	}
 
-	s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION);
+	s_con = nm_connection_get_setting_connection (NM_CONNECTION (connection));
 	g_assert (s_con);
 	id = nm_setting_connection_get_id (s_con);
 
@@ -824,8 +824,7 @@ pk_button_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		connection = get_active_connection (info->treeview);
 		if (connection) {
-			s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection),
-			                                                           NM_TYPE_SETTING_CONNECTION);
+			s_con = nm_connection_get_setting_connection (NM_CONNECTION (connection));
 			g_assert (s_con);
 	
 			sensitive = !nm_setting_connection_get_read_only (s_con);
@@ -855,7 +854,7 @@ vpn_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 	if (!connection)
 		goto done;
 
-	s_vpn = NM_SETTING_VPN (nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_VPN));
+	s_vpn = nm_connection_get_setting_vpn (NM_CONNECTION (connection));
 	service_type = s_vpn ? nm_setting_vpn_get_service_type (s_vpn) : NULL;
 
 	if (!service_type)
@@ -886,7 +885,7 @@ import_success_cb (NMConnection *connection, gpointer user_data)
 	const char *message = _("The connection editor dialog could not be initialized due to an unknown error.");
 
 	/* Basic sanity checks of the connection */
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	if (!s_con) {
 		s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
 		nm_connection_add_setting (connection, NM_SETTING (s_con));
@@ -915,7 +914,7 @@ import_success_cb (NMConnection *connection, gpointer user_data)
 		g_free (s);
 	}
 
-	s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN));
+	s_vpn = nm_connection_get_setting_vpn (connection);
 	service_type = s_vpn ? nm_setting_vpn_get_service_type (s_vpn) : NULL;
 
 	if (!service_type || !strlen (service_type)) {
@@ -1414,7 +1413,7 @@ connection_added (NMRemoteSettings *settings,
 	if (!store)
 		return;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (NM_CONNECTION (connection));
 
 	last_used = format_last_used (nm_setting_connection_get_timestamp (s_con));
 
@@ -1621,7 +1620,7 @@ connections_read (NMRemoteSettings *settings, EditData *data)
 		const char *type;
 		ActionInfo *info;
 
-		s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+		s_con = nm_connection_get_setting_connection (connection);
 		type = nm_setting_connection_get_connection_type (s_con);
 		info = find_action_info (data->self, nm_connection_lookup_setting_type (type), "edit");
 		if (info != NULL)
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index cb741f94..0c413b6e 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -145,7 +145,7 @@ ce_page_dsl_new (NMConnection *connection,
 	dsl_private_init (self);
 	priv = CE_PAGE_DSL_GET_PRIVATE (self);
 
-	priv->setting = (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
+	priv->setting = nm_connection_get_setting_pppoe (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_PPPOE (nm_setting_pppoe_new ());
 		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
@@ -195,7 +195,7 @@ validate (CEPage *page, NMConnection *connection, GError **error)
 
 	ui_to_setting (self);
 
-	foo = g_slist_append (NULL, nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP));
+	foo = g_slist_append (NULL, nm_connection_get_setting_ppp (connection));
 	valid = nm_setting_verify (NM_SETTING (priv->setting), foo, error);
 	g_slist_free (foo);
 
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 6728d107..4e50a02f 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -122,7 +122,7 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
 
 	builder = CE_PAGE (self)->builder;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	connection_type = nm_setting_connection_get_connection_type (s_con);
 	g_assert (connection_type);
@@ -989,11 +989,11 @@ ce_page_ip4_new (NMConnection *connection,
 
 	priv->window_group = gtk_window_group_new ();
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	priv->connection_id = g_strdup (nm_setting_connection_get_id (s_con));
 
-	priv->setting = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
+	priv->setting = nm_connection_get_setting_ip4_config (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
 		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index ef993b84..c2e89e96 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -121,7 +121,7 @@ ip6_private_init (CEPageIP6 *self, NMConnection *connection)
 
 	builder = CE_PAGE (self)->builder;
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	connection_type = nm_setting_connection_get_connection_type (s_con);
 	g_assert (connection_type);
@@ -953,11 +953,11 @@ ce_page_ip6_new (NMConnection *connection,
 
 	priv->window_group = gtk_window_group_new ();
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	priv->connection_id = g_strdup (nm_setting_connection_get_id (s_con));
 
-	priv->setting = (NMSettingIP6Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP6_CONFIG);
+	priv->setting = nm_connection_get_setting_ip6_config (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new ());
 		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index 2f164e0a..b27bc4cb 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -288,7 +288,7 @@ ce_page_ppp_new (NMConnection *connection,
 	ppp_private_init (self);
 	priv = CE_PAGE_PPP_GET_PRIVATE (self);
 
-	priv->setting = (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
+	priv->setting = nm_connection_get_setting_ppp (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_PPP (nm_setting_ppp_new ());
 		g_object_set (G_OBJECT (priv->setting),
@@ -300,7 +300,7 @@ ce_page_ppp_new (NMConnection *connection,
 
 	priv->window_group = gtk_window_group_new ();
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	priv->connection_id = g_strdup (nm_setting_connection_get_id (s_con));
 
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 19324c90..a66da9c5 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -114,7 +114,7 @@ ce_page_vpn_new (NMConnection *connection,
 
 	priv = CE_PAGE_VPN_GET_PRIVATE (self);
 
-	priv->setting = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
+	priv->setting = nm_connection_get_setting_vpn (connection);
 	g_assert (priv->setting);
 
 	service_type = nm_setting_vpn_get_service_type (priv->setting);
diff --git a/src/connection-editor/page-wired-security.c b/src/connection-editor/page-wired-security.c
index 2979036c..a5ee2033 100644
--- a/src/connection-editor/page-wired-security.c
+++ b/src/connection-editor/page-wired-security.c
@@ -130,7 +130,7 @@ ce_page_wired_security_new (NMConnection *connection,
 	g_object_ref_sink (G_OBJECT (parent->page));
 	gtk_container_set_border_width (GTK_CONTAINER (parent->page), 6);
 
-	if (nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X))
+	if (nm_connection_get_setting_802_1x (connection))
 		priv->initial_have_8021x = TRUE;
 
 	priv->enabled = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_mnemonic (_("Use 802.1_X security for this connection")));
diff --git a/src/connection-editor/page-wired.c b/src/connection-editor/page-wired.c
index d2025583..5de3cb23 100644
--- a/src/connection-editor/page-wired.c
+++ b/src/connection-editor/page-wired.c
@@ -278,7 +278,7 @@ ce_page_wired_new (NMConnection *connection,
 	wired_private_init (self);
 	priv = CE_PAGE_WIRED_GET_PRIVATE (self);
 
-	priv->setting = (NMSettingWired *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED);
+	priv->setting = nm_connection_get_setting_wired (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_WIRED (nm_setting_wired_new ());
 		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
diff --git a/src/connection-editor/page-wireless-security.c b/src/connection-editor/page-wireless-security.c
index eae0d93d..b51ab223 100644
--- a/src/connection-editor/page-wireless-security.c
+++ b/src/connection-editor/page-wireless-security.c
@@ -206,7 +206,7 @@ finish_setup (CEPageWirelessSecurity *self, gpointer unused, GError *error, gpoi
 	if (error)
 		return;
 
-	s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
+	s_wireless = nm_connection_get_setting_wireless (connection);
 	g_assert (s_wireless);
 
 	combo = GTK_COMBO_BOX (GTK_WIDGET (gtk_builder_get_object (parent->builder, "wireless_security_combo")));
@@ -222,8 +222,7 @@ finish_setup (CEPageWirelessSecurity *self, gpointer unused, GError *error, gpoi
 	if (mode && !strcmp (mode, "adhoc"))
 		is_adhoc = TRUE;
 
-	s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (nm_connection_get_setting (connection, 
-	                                               NM_TYPE_SETTING_WIRELESS_SECURITY));
+	s_wireless_sec = nm_connection_get_setting_wireless_security (connection);
 
 	security = nm_setting_wireless_get_security (s_wireless);
 	if (!security || strcmp (security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME))
@@ -250,7 +249,7 @@ finish_setup (CEPageWirelessSecurity *self, gpointer unused, GError *error, gpoi
 		if (default_type == NMU_SEC_STATIC_WEP) {
 			NMSettingWirelessSecurity *s_wsec;
 
-			s_wsec = (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
+			s_wsec = nm_connection_get_setting_wireless_security (connection);
 			if (s_wsec)
 				wep_type = nm_setting_wireless_security_get_wep_key_type (s_wsec);
 			if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN)
@@ -355,7 +354,7 @@ ce_page_wireless_security_new (NMConnection *connection,
 	NMUtilsSecurityType default_type = NMU_SEC_NONE;
 	const char *security;
 
-	s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
+	s_wireless = nm_connection_get_setting_wireless (connection);
 	if (!s_wireless) {
 		g_set_error_literal (error, 0, 0, _("Could not load WiFi security user interface; missing WiFi setting."));
 		return NULL;
@@ -375,8 +374,7 @@ ce_page_wireless_security_new (NMConnection *connection,
 
 	self->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-	s_wsec = NM_SETTING_WIRELESS_SECURITY (nm_connection_get_setting (connection, 
-	                                       NM_TYPE_SETTING_WIRELESS_SECURITY));
+	s_wsec = nm_connection_get_setting_wireless_security (connection);
 
 	security = nm_setting_wireless_get_security (s_wireless);
 	if (!security || strcmp (security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME))
@@ -434,7 +432,7 @@ validate (CEPage *page, NMConnection *connection, GError **error)
 	WirelessSecurity *sec;
 	gboolean valid = FALSE;
 
-	s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
+	s_wireless = nm_connection_get_setting_wireless (connection);
 	g_assert (s_wireless);
 
 	sec = wireless_security_combo_get_active (self);
diff --git a/src/connection-editor/page-wireless.c b/src/connection-editor/page-wireless.c
index fcf9f91e..cc00e9e1 100644
--- a/src/connection-editor/page-wireless.c
+++ b/src/connection-editor/page-wireless.c
@@ -463,7 +463,7 @@ ce_page_wireless_new (NMConnection *connection,
 	wireless_private_init (self);
 	priv = CE_PAGE_WIRELESS_GET_PRIVATE (self);
 
-	priv->setting = (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
+	priv->setting = nm_connection_get_setting_wireless (connection);
 	if (!priv->setting) {
 		priv->setting = NM_SETTING_WIRELESS (nm_setting_wireless_new ());
 		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
index ab1ce83e..943ee2cc 100644
--- a/src/connection-editor/vpn-helpers.c
+++ b/src/connection-editor/vpn-helpers.c
@@ -322,14 +322,14 @@ export_vpn_to_file_cb (GtkWidget *dialog, gint response, gpointer user_data)
 			goto out;
 	}
 
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	s_con = nm_connection_get_setting_connection (connection);
 	id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
 	if (!id) {
 		g_set_error (&error, 0, 0, "connection setting invalid");
 		goto done;
 	}
 
-	s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
+	s_vpn = nm_connection_get_setting_vpn (connection);
 	service_type = s_vpn ? nm_setting_vpn_get_service_type (s_vpn) : NULL;
 
 	if (!service_type) {
@@ -379,7 +379,7 @@ vpn_export (NMConnection *connection)
 	const char *service_type;
 	const char *home_folder;
 
-	s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN));
+	s_vpn = nm_connection_get_setting_vpn (connection);
 	service_type = s_vpn ? nm_setting_vpn_get_service_type (s_vpn) : NULL;
 
 	if (!service_type) {