Commit 34ab7089 authored by Lubomir Rintel's avatar Lubomir Rintel

editor/page: use defines for signal names

Doing this for consistency with code where Thomas insists this is a good
idea. Easier than fixing Thomas.
parent 1232b26d
......@@ -843,7 +843,7 @@ ce_page_class_init (CEPageClass *page_class)
G_TYPE_NONE, 0);
signals[INITIALIZED] =
g_signal_new ("initialized",
g_signal_new (CE_PAGE_INITIALIZED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CEPageClass, initialized),
......
......@@ -69,6 +69,9 @@ typedef void (*PageNewConnectionFunc) (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL,
#define CE_PAGE_CONNECTION "connection"
#define CE_PAGE_PARENT_WINDOW "parent-window"
#define CE_PAGE_CHANGED "changed"
#define CE_PAGE_INITIALIZED "initialized"
typedef struct {
GObject parent;
......
......@@ -897,8 +897,8 @@ add_page (NMConnectionEditor *editor,
GINT_TO_POINTER (g_slist_length (editor->initializing_pages)));
editor->initializing_pages = g_slist_append (editor->initializing_pages, page);
g_signal_connect (page, "changed", G_CALLBACK (page_changed), editor);
g_signal_connect (page, "initialized", G_CALLBACK (page_initialized), editor);
g_signal_connect (page, CE_PAGE_CHANGED, G_CALLBACK (page_changed), editor);
g_signal_connect (page, CE_PAGE_INITIALIZED, G_CALLBACK (page_initialized), editor);
}
return !!page;
}
......
......@@ -130,7 +130,7 @@ ce_page_8021x_security_new (NMConnectionEditor *editor,
priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
if (priv->initial_have_8021x)
*out_secrets_setting_name = NM_SETTING_802_1X_SETTING_NAME;
......
......@@ -132,7 +132,7 @@ ce_page_bluetooth_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -457,7 +457,7 @@ ce_page_bond_new (NMConnectionEditor *editor,
}
priv->wired = nm_connection_get_setting_wired (connection);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -117,7 +117,7 @@ ce_page_bridge_port_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -243,7 +243,7 @@ ce_page_bridge_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -640,7 +640,7 @@ ce_page_dcb_new (NMConnectionEditor *editor,
} else
priv->options = (NMSettingDcb *) nm_setting_dcb_new ();
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -229,7 +229,7 @@ ce_page_dsl_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
*out_secrets_setting_name = NM_SETTING_PPPOE_SETTING_NAME;
......
......@@ -367,7 +367,7 @@ ce_page_ethernet_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -382,7 +382,7 @@ ce_page_general_new (NMConnectionEditor *editor,
priv->is_vpn = nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -158,7 +158,7 @@ ce_page_infiniband_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -185,7 +185,7 @@ ce_page_ip_tunnel_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -1237,7 +1237,7 @@ ce_page_ip4_new (NMConnectionEditor *editor,
priv->setting = nm_connection_get_setting_ip4_config (connection);
g_assert (priv->setting);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -1219,7 +1219,7 @@ ce_page_ip6_new (NMConnectionEditor *editor,
priv->setting = nm_connection_get_setting_ip6_config (connection);
g_assert (priv->setting);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -199,7 +199,7 @@ ce_page_macsec_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
*out_secrets_setting_name = NM_SETTING_MACSEC_SETTING_NAME;
......
......@@ -74,7 +74,7 @@ constructed (GObject *object)
{
CEPageMaster *self = CE_PAGE_MASTER (object);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
G_OBJECT_CLASS (ce_page_master_parent_class)->constructed (object);
}
......
......@@ -326,7 +326,7 @@ ce_page_mobile_new (NMConnectionEditor *editor,
return NULL;
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -296,7 +296,7 @@ ce_page_ppp_new (NMConnectionEditor *editor,
g_assert (s_con);
priv->connection_id = g_strdup (nm_setting_connection_get_id (s_con));
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
*out_secrets_setting_name = NM_SETTING_PPP_SETTING_NAME;
......
......@@ -224,7 +224,7 @@ ce_page_proxy_new (NMConnectionEditor *editor,
priv->setting = nm_connection_get_setting_proxy (connection);
g_assert (priv->setting);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -664,7 +664,7 @@ ce_page_team_port_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -1042,7 +1042,7 @@ ce_page_team_new (NMConnectionEditor *editor,
}
priv->wired = nm_connection_get_setting_wired (connection);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -604,7 +604,7 @@ ce_page_vlan_new (NMConnectionEditor *editor,
}
priv->s_hw = nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -120,7 +120,7 @@ ce_page_vpn_new (NMConnectionEditor *editor,
}
priv->plugin = g_object_ref (priv->plugin);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
*out_secrets_setting_name = NM_SETTING_VPN_SETTING_NAME;
......
......@@ -500,7 +500,7 @@ ce_page_wifi_security_new (NMConnectionEditor *editor,
nm_connection_editor_check_unsupported_properties (editor, (NMSetting *) s_wsec, known_wsec_props);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
......@@ -449,7 +449,7 @@ ce_page_wifi_new (NMConnectionEditor *editor,
nm_connection_add_setting (connection, NM_SETTING (priv->setting));
}
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
g_signal_connect (self, CE_PAGE_INITIALIZED, G_CALLBACK (finish_setup), NULL);
return CE_PAGE (self);
}
......
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