network: Implement the new design for wired
This expands the connection editor to cover ethernet, and adds support for multiple wired profiles.
This commit is contained in:
Matthias Clasen
Dan Winship
parent
e5cc7d8011
commit
8b593e6ac8
22 changed files with 2356 additions and 232 deletions
194
panels/network/connection-editor/ce-page-8021x-security.c
Normal file
194
panels/network/connection-editor/ce-page-8021x-security.c
Normal file
|
|
@ -0,0 +1,194 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager Connection editor -- Connection editor for NetworkManager
|
||||
*
|
||||
* Dan Williams <dcbw@redhat.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* (C) Copyright 2008 - 2012 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include <NetworkManager.h>
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wired.h>
|
||||
#include <nm-setting-8021x.h>
|
||||
#include <nm-setting-wireless.h>
|
||||
#include <nm-utils.h>
|
||||
|
||||
#include "wireless-security.h"
|
||||
#include "ce-page-ethernet.h"
|
||||
#include "ce-page-8021x-security.h"
|
||||
|
||||
G_DEFINE_TYPE (CEPage8021xSecurity, ce_page_8021x_security, CE_TYPE_PAGE)
|
||||
|
||||
static void
|
||||
enable_toggled (GObject *sw, GParamSpec *pspec, gpointer user_data)
|
||||
{
|
||||
CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (user_data);
|
||||
|
||||
gtk_widget_set_sensitive (page->security_widget, gtk_switch_get_active (page->enabled));
|
||||
ce_page_changed (CE_PAGE (page));
|
||||
}
|
||||
|
||||
static void
|
||||
stuff_changed (WirelessSecurity *sec, gpointer user_data)
|
||||
{
|
||||
ce_page_changed (CE_PAGE (user_data));
|
||||
}
|
||||
|
||||
static void
|
||||
finish_setup (CEPage8021xSecurity *page, gpointer unused, GError *error, gpointer user_data)
|
||||
{
|
||||
GtkWidget *parent;
|
||||
GtkWidget *vbox;
|
||||
GtkWidget *heading;
|
||||
|
||||
if (error)
|
||||
return;
|
||||
|
||||
vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox"));
|
||||
heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec"));
|
||||
|
||||
page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
|
||||
|
||||
page->security = (WirelessSecurity *) ws_wpa_eap_new (CE_PAGE (page)->connection, TRUE, FALSE);
|
||||
if (!page->security) {
|
||||
g_warning ("Could not load 802.1x user interface.");
|
||||
return;
|
||||
}
|
||||
|
||||
wireless_security_set_changed_notify (page->security, stuff_changed, page);
|
||||
page->security_widget = wireless_security_get_widget (page->security);
|
||||
parent = gtk_widget_get_parent (page->security_widget);
|
||||
if (parent)
|
||||
gtk_container_remove (GTK_CONTAINER (parent), page->security_widget);
|
||||
|
||||
gtk_switch_set_active (page->enabled, page->initial_have_8021x);
|
||||
g_signal_connect (page->enabled, "notify::active", G_CALLBACK (enable_toggled), page);
|
||||
gtk_widget_set_sensitive (page->security_widget, page->initial_have_8021x);
|
||||
|
||||
gtk_size_group_add_widget (page->group, heading);
|
||||
wireless_security_add_to_size_group (page->security, page->group);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (vbox), page->security_widget);
|
||||
|
||||
}
|
||||
|
||||
CEPage *
|
||||
ce_page_8021x_security_new (NMConnection *connection,
|
||||
NMClient *client,
|
||||
NMRemoteSettings *settings)
|
||||
{
|
||||
CEPage8021xSecurity *page;
|
||||
|
||||
page = CE_PAGE_8021X_SECURITY (ce_page_new (CE_TYPE_PAGE_8021X_SECURITY,
|
||||
connection,
|
||||
client,
|
||||
settings,
|
||||
"/org/gnome/control-center/network/8021x-security-page.ui",
|
||||
_("Security")));
|
||||
|
||||
if (nm_connection_get_setting_802_1x (connection))
|
||||
page->initial_have_8021x = TRUE;
|
||||
|
||||
page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "8021x_switch"));
|
||||
|
||||
g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL);
|
||||
|
||||
if (page->initial_have_8021x)
|
||||
CE_PAGE (page)->security_setting = NM_SETTING_802_1X_SETTING_NAME;
|
||||
|
||||
return CE_PAGE (page);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
validate (CEPage *cepage, NMConnection *connection, GError **error)
|
||||
{
|
||||
CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (cepage);
|
||||
gboolean valid = TRUE;
|
||||
|
||||
if (gtk_switch_get_active (page->enabled)) {
|
||||
NMConnection *tmp_connection;
|
||||
NMSetting *s_8021x;
|
||||
|
||||
/* FIXME: get failed property and error out of wireless security objects */
|
||||
valid = wireless_security_validate (page->security, NULL);
|
||||
if (valid) {
|
||||
NMSetting *s_con;
|
||||
|
||||
/* Here's a nice hack to work around the fact that ws_802_1x_fill_connection needs wireless setting. */
|
||||
tmp_connection = nm_connection_new ();
|
||||
nm_connection_add_setting (tmp_connection, nm_setting_wireless_new ());
|
||||
|
||||
/* temp connection needs a 'connection' setting too, since most of
|
||||
* the EAP methods need the UUID for CA cert ignore stuff.
|
||||
*/
|
||||
s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
|
||||
nm_connection_add_setting (tmp_connection, nm_setting_duplicate (s_con));
|
||||
|
||||
ws_802_1x_fill_connection (page->security, "wpa_eap_auth_combo", tmp_connection);
|
||||
|
||||
s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
|
||||
nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
|
||||
|
||||
g_object_unref (tmp_connection);
|
||||
} else
|
||||
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, "Invalid 802.1x security");
|
||||
} else {
|
||||
nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
|
||||
valid = TRUE;
|
||||
}
|
||||
|
||||
return valid;
|
||||
}
|
||||
|
||||
static void
|
||||
ce_page_8021x_security_init (CEPage8021xSecurity *page)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
dispose (GObject *object)
|
||||
{
|
||||
CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (object);
|
||||
|
||||
if (page->security) {
|
||||
wireless_security_unref (page->security);
|
||||
page->security = NULL;
|
||||
}
|
||||
|
||||
g_clear_object (&page->group);
|
||||
|
||||
G_OBJECT_CLASS (ce_page_8021x_security_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (security_class);
|
||||
CEPageClass *parent_class = CE_PAGE_CLASS (security_class);
|
||||
|
||||
/* virtual methods */
|
||||
object_class->dispose = dispose;
|
||||
|
||||
parent_class->validate = validate;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue