diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index 254810dea70d88dd29f6d2f947129400b4c529f2..911202f7e13682009fab4d4846af0712bd45b4d3 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -36,7 +36,11 @@
 /* for ARPHRD_ETHER / ARPHRD_INFINIBAND for MAC utilies */
 #include <net/if_arp.h>
 
-typedef void (*PageNewConnectionResultFunc) (NMConnection *connection,
+struct _func_tag_page_new_connection_result;
+#define FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_IMPL struct _func_tag_page_new_connection_result *_dummy
+#define FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL ((struct _func_tag_page_new_connection_result *) NULL)
+typedef void (*PageNewConnectionResultFunc) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_IMPL,
+                                             NMConnection *connection,
                                              gboolean canceled,
                                              GError *error,
                                              gpointer user_data);
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 4c1ed035dcd8e8eb0ab64123d61ebcf070d84cc4..ece068028e52f18e4596a4a59f33e5618cf9ffad 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -535,7 +535,8 @@ typedef struct {
 } NewConnectionData;
 
 static void
-new_connection_result (NMConnection *connection,
+new_connection_result (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_IMPL,
+                       NMConnection *connection,
                        gboolean canceled,
                        GError *error,
                        gpointer user_data)
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 32f4f9b832bfcdd3fc632db4273f4350f5481578..6f1de64a4f0b377b1a148bf6b3b983c2981d95ef 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -274,7 +274,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
 	}
 
 out:
-	(*info->result_func) (info->connection, canceled, NULL, info->user_data);
+	(*info->result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, info->connection, canceled, NULL, info->user_data);
 
 	if (wizard)
 		nma_mobile_wizard_destroy (wizard);
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index cbe6e0b6203b5028e7dbd462420257998ac6e1e7..5e02a2babb9668793a94f1bd24e4bff9b19c93ae 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -645,6 +645,6 @@ bond_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	              NULL);
 	g_free (my_iface);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
 
diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
index 367dc501497c551c2817cf367f478edb07469eed..1c33a7e46f4913ffbdada802f85c2ab99d604567 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -339,5 +339,5 @@ bridge_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	              NULL);
 	g_free (my_iface);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index 2a14fa1e14e87a59fb6134aee3bd1a73d97841a9..19833c662268510a95250973b8f01e327db4500a 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -228,5 +228,5 @@ dsl_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	              NULL);
 	nm_connection_add_setting (connection, setting);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index c7c2ce6fcfdb5c144e44885d0b247e1ddc3d3dcc..e82800c85b6a3ae690170f94d39b954c05bc96c0 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -522,5 +522,5 @@ ethernet_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	                             client);
 	nm_connection_add_setting (connection, nm_setting_wired_new ());
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index 1dafcb9ec495706b7493a2b7cde80a81d45b1b9f..b1a3da115dfd0a4a5332b83f745a8b79d218b2b4 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -254,5 +254,5 @@ infiniband_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	                             client);
 	nm_connection_add_setting (connection, nm_setting_infiniband_new ());
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index e176cdccc8cc67f0cede3ca6507984c583c73c3d..aa84a4c8f02580ab3d13901fadd6b7f8074fc80d 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -490,7 +490,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
 		nm_connection_add_setting (info->connection, nm_setting_ppp_new ());
 	}
 
-	(*info->result_func) (info->connection, canceled, NULL, info->user_data);
+	(*info->result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, info->connection, canceled, NULL, info->user_data);
 
 	if (wizard)
 		nma_mobile_wizard_destroy (wizard);
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index 873656bcc816b72a8868be0a167ea6471dcd8c6b..87adbea326e9de9b07da9ab561efee570f2e14e3 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -1276,5 +1276,5 @@ team_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	              NULL);
 	g_free (my_iface);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
index b442ff8051e718f6572ed5871cf20917a6f7f73c..33e515cc840720ac0c0b9c39533d475ea74b875d 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -801,5 +801,5 @@ vlan_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	                             client);
 	nm_connection_add_setting (connection, nm_setting_vlan_new ());
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index df6f10ca72115153e63ff9773cba7d75329ef978..7d327d128139f2b596b5ecb1d815f641dfe9e2f8 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -224,7 +224,7 @@ vpn_type_result_func (FUNC_TAG_NEW_CONNECTION_RESULT_IMPL,
 {
 	NewVpnInfo *info = user_data;
 
-	info->result_func (connection, connection == NULL, NULL, info->user_data);
+	info->result_func (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, connection == NULL, NULL, info->user_data);
 	g_slice_free (NewVpnInfo, info);
 }
 
@@ -321,5 +321,5 @@ vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 
 	complete_vpn_connection (connection, client);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index b9926722cd1daa2d4f7796e95d03aa320ef0514d..f2bb01d637e8e538c7b877cba63d835ec2456fa5 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -620,5 +620,5 @@ wifi_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
 	g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
 	nm_connection_add_setting (connection, s_wifi);
 
-	(*result_func) (connection, FALSE, NULL, user_data);
+	(*result_func) (FUNC_TAG_PAGE_NEW_CONNECTION_RESULT_CALL, connection, FALSE, NULL, user_data);
 }