Commit 1009ec16 authored by Thomas Haller's avatar Thomas Haller

c-e: tag PageNewConnectionFunc with a special argument

parent 4c968b3a
......@@ -43,7 +43,11 @@ typedef void (*PageNewConnectionResultFunc) (NMConnection *connection,
typedef GSList * (*PageGetConnectionsFunc) (gpointer user_data);
typedef void (*PageNewConnectionFunc) (GtkWindow *parent,
struct _func_tag_page_new_connection;
#define FUNC_TAG_PAGE_NEW_CONNECTION_IMPL struct _func_tag_page_new_connection *_dummy
#define FUNC_TAG_PAGE_NEW_CONNECTION_CALL ((struct _func_tag_page_new_connection *) NULL)
typedef void (*PageNewConnectionFunc) (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -255,7 +255,8 @@ import_vpn_from_file_cb (GtkWidget *dialog, gint response, gpointer user_data)
if (connection) {
/* Wrap around the actual new function so that the page can complete
* the missing parts, such as UUID or make up the connection name. */
vpn_connection_new (info->parent,
vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_CALL,
info->parent,
NULL,
NULL,
connection,
......@@ -274,7 +275,8 @@ out:
}
static void
vpn_connection_import (GtkWindow *parent,
vpn_connection_import (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......@@ -576,7 +578,8 @@ new_connection_of_type (GtkWindow *parent_window,
ncd->result_func = result_func;
ncd->user_data = user_data;
new_func (parent_window,
new_func (FUNC_TAG_PAGE_NEW_CONNECTION_CALL,
parent_window,
detail,
detail_data,
connection,
......
......@@ -285,7 +285,8 @@ out:
}
void
bluetooth_connection_new (GtkWindow *parent,
bluetooth_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -54,7 +54,8 @@ CEPage *ce_page_bluetooth_new (NMConnectionEditor *edit,
const char **out_secrets_setting_name,
GError **error);
void bluetooth_connection_new (GtkWindow *parent,
void bluetooth_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -599,7 +599,8 @@ ce_page_bond_class_init (CEPageBondClass *bond_class)
void
bond_connection_new (GtkWindow *parent,
bond_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -50,7 +50,8 @@ CEPage *ce_page_bond_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void bond_connection_new (GtkWindow *parent,
void bond_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -293,7 +293,8 @@ ce_page_bridge_class_init (CEPageBridgeClass *bridge_class)
}
void
bridge_connection_new (GtkWindow *parent,
bridge_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -50,7 +50,8 @@ CEPage *ce_page_bridge_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void bridge_connection_new (GtkWindow *parent,
void bridge_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -202,7 +202,8 @@ ce_page_dsl_class_init (CEPageDslClass *dsl_class)
void
dsl_connection_new (GtkWindow *parent,
dsl_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -52,7 +52,8 @@ CEPage *ce_page_dsl_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void dsl_connection_new (GtkWindow *parent,
void dsl_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -506,7 +506,8 @@ ce_page_ethernet_class_init (CEPageEthernetClass *ethernet_class)
void
ethernet_connection_new (GtkWindow *parent,
ethernet_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -52,7 +52,8 @@ CEPage *ce_page_ethernet_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void ethernet_connection_new (GtkWindow *parent,
void ethernet_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -238,7 +238,8 @@ ce_page_infiniband_class_init (CEPageInfinibandClass *infiniband_class)
void
infiniband_connection_new (GtkWindow *parent,
infiniband_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -50,7 +50,8 @@ CEPage *ce_page_infiniband_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void infiniband_connection_new (GtkWindow *parent,
void infiniband_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -507,7 +507,8 @@ cancel_dialog (GtkDialog *dialog)
}
void
mobile_connection_new (GtkWindow *parent,
mobile_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -52,7 +52,8 @@ CEPage *ce_page_mobile_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void mobile_connection_new (GtkWindow *parent,
void mobile_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -1229,7 +1229,8 @@ ce_page_team_class_init (CEPageTeamClass *team_class)
void
team_connection_new (GtkWindow *parent,
team_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -50,7 +50,8 @@ CEPage *ce_page_team_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void team_connection_new (GtkWindow *parent,
void team_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -785,7 +785,8 @@ ce_page_vlan_class_init (CEPageVlanClass *vlan_class)
void
vlan_connection_new (GtkWindow *parent,
vlan_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -50,7 +50,8 @@ CEPage *ce_page_vlan_new (NMConnectionEditor *editor,
const char **out_secrets_setting_name,
GError **error);
void vlan_connection_new (GtkWindow *parent,
void vlan_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -229,7 +229,8 @@ vpn_type_result_func (FUNC_TAG_NEW_CONNECTION_RESULT_IMPL,
}
void
vpn_connection_new (GtkWindow *parent,
vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -59,7 +59,8 @@ CEPage *ce_page_vpn_new (NMConnectionEditor *editor,
gboolean ce_page_vpn_can_export (CEPageVpn *page);
void vpn_connection_new (GtkWindow *parent,
void vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -600,7 +600,8 @@ ce_page_wifi_class_init (CEPageWifiClass *wifi_class)
void
wifi_connection_new (GtkWindow *parent,
wifi_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
......@@ -56,7 +56,8 @@ CEPage *ce_page_wifi_new (NMConnectionEditor *editor,
GBytes *ce_page_wifi_get_ssid (CEPageWifi *self);
void wifi_connection_new (GtkWindow *parent,
void wifi_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
GtkWindow *parent,
const char *detail,
gpointer detail_data,
NMConnection *connection,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment