applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Simplify complete_connection_for_type()

Browse source 
Now that there's only one type to be added (VPNs).

https://bugzilla.gnome.org/show_bug.cgi?id=767614
This commit is contained in:
Bastien Nocera 2016-06-13 23:06:24 +02:00
parent d0fcd5843c
commit c6f1b3a2be
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
panels/network/connection-editor/net-connection-editor.c
View file

@ -604,23 +604,11 @@ net_connection_editor_set_connection (NetConnectionEditor *editor,
gtk_tree_path_free (path); gtk_tree_path_free (path);
} }
typedef struct {
const char *name;
GType (*type_func) (void);
} NetConnectionType;
static const NetConnectionType connection_types[] = {
{ N_("VPN"), nm_setting_vpn_get_type },
};
static const NetConnectionType *vpn_connection_type = &connection_types[0];
static NMConnection * static NMConnection *
complete_connection_for_type (NetConnectionEditor *editor, NMConnection *connection, complete_vpn_connection (NetConnectionEditor *editor, NMConnection *connection)
const NetConnectionType *connection_type)
{ {
NMSettingConnection *s_con; NMSettingConnection *s_con;
NMSetting *s_type; NMSetting *s_type;
GType connection_gtype;
if (!connection) if (!connection)
connection = nm_simple_connection_new (); connection = nm_simple_connection_new ();
@ -644,17 +632,16 @@ complete_connection_for_type (NetConnectionEditor *editor, NMConnection *connect
gchar *id; gchar *id;
connections = nm_client_get_connections (editor->client); connections = nm_client_get_connections (editor->client);
id = ce_page_get_next_available_name (connections, NAME_FORMAT_TYPE, _(connection_type->name)); id = ce_page_get_next_available_name (connections, NAME_FORMAT_TYPE, _("VPN"));
g_object_set (s_con, g_object_set (s_con,
NM_SETTING_CONNECTION_ID, id, NM_SETTING_CONNECTION_ID, id,
NULL); NULL);
g_free (id); g_free (id);
} }
connection_gtype = connection_type->type_func (); s_type = nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
s_type = nm_connection_get_setting (connection, connection_gtype);
if (!s_type) { if (!s_type) {
s_type = g_object_new (connection_gtype, NULL); s_type = g_object_new (NM_TYPE_SETTING_VPN, NULL);
nm_connection_add_setting (connection, s_type); nm_connection_add_setting (connection, s_type);
} }
@ -695,7 +682,7 @@ vpn_import_complete (NMConnection *connection, gpointer user_data)
return; return;
} }
complete_connection_for_type (editor, connection, vpn_connection_type); complete_vpn_connection (editor, connection);
finish_add_connection (editor, connection); finish_add_connection (editor, connection);
} }
@ -712,7 +699,7 @@ vpn_type_activated (GtkListBox *list, GtkWidget *row, NetConnectionEditor *edito
return; return;
} }
connection = complete_connection_for_type (editor, NULL, vpn_connection_type); connection = complete_vpn_connection (editor, NULL);
s_vpn = nm_connection_get_setting_vpn (connection); s_vpn = nm_connection_get_setting_vpn (connection);
g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_name, NULL); g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_name, NULL);