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

network: Remove team support

Browse source 
It will be supported by Cockpit in the near future:
https://github.com/cockpit-project/cockpit/issues/4330

https://bugzilla.gnome.org/show_bug.cgi?id=747443
This commit is contained in:
Bastien Nocera 2016-04-29 13:54:16 +02:00
parent b38bf8b672
commit 9974342865
5 changed files with 1 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

8
panels/network/Makefile.am
View file

@ -43,12 +43,6 @@ libnetwork_la_SOURCES = \
cc-network-panel.c \
cc-network-panel.h
TEAM_FILES = net-device-team.c net-device-team.h
EXTRA_DIST = $(TEAM_FILES)
if HAVE_NM_UNSTABLE
libnetwork_la_SOURCES += $(TEAM_FILES)
endif
libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la
libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
@ -66,6 +60,6 @@ desktop_in_files = gnome-network-panel.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
EXTRA_DIST += $(resource_files) network.gresource.xml
EXTRA_DIST = $(resource_files) network.gresource.xml
-include $(top_srcdir)/git.mk

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

@ -581,9 +581,6 @@ typedef struct {
static const NetConnectionType connection_types[] = {
{ N_("VPN"), nm_setting_vpn_get_type },
#ifdef HAVE_NM_UNSTABLE
{ N_("Team"), nm_setting_team_get_type },
#endif /* NM_UNSTABLE */
{ N_("VLAN"), nm_setting_vlan_get_type }
};
static const NetConnectionType *vpn_connection_type = &connection_types[0];

190
panels/network/net-device-team.c
View file

@ -1,190 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2013 Red Hat, Inc.
*
* Licensed under the GNU General Public License Version 2
*
* 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.
*/
#include "config.h"
#include <glib-object.h>
#include <glib/gi18n.h>
#include <nm-client.h>
#include <nm-device.h>
#include <nm-device-team.h>
#include <nm-remote-connection.h>
#include "panel-common.h"
#include "cc-network-panel.h"
#include "net-device-team.h"
#define NET_DEVICE_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeamPrivate))
struct _NetDeviceTeamPrivate {
char *slaves;
};
enum {
PROP_0,
PROP_SLAVES,
PROP_LAST
};
G_DEFINE_TYPE (NetDeviceTeam, net_device_team, NET_TYPE_VIRTUAL_DEVICE)
static void
net_device_team_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (object);
NetDeviceTeamPrivate *priv = device_team->priv;
switch (prop_id) {
case PROP_SLAVES:
g_value_set_string (value, priv->slaves);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (device_team, prop_id, pspec);
break;
}
}
static void
net_device_team_constructed (GObject *object)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (object);
net_virtual_device_add_row (NET_VIRTUAL_DEVICE (device_team),
_("Team slaves"), "slaves");
G_OBJECT_CLASS (net_device_team_parent_class)->constructed (object);
}
static void
nm_device_slaves_changed (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (user_data);
NetDeviceTeamPrivate *priv = device_team->priv;
NMDeviceTeam *nm_device = NM_DEVICE_TEAM (object);
CcNetworkPanel *panel;
GPtrArray *net_devices;
NetDevice *net_device;
NMDevice *slave;
const GPtrArray *slaves;
int i, j;
GString *str;
g_free (priv->slaves);
slaves = nm_device_team_get_slaves (nm_device);
if (!slaves) {
priv->slaves = g_strdup (_("(none)"));
g_object_notify (G_OBJECT (device_team), "slaves");
return;
}
panel = net_object_get_panel (NET_OBJECT (device_team));
net_devices = cc_network_panel_get_devices (panel);
str = g_string_new (NULL);
for (i = 0; i < slaves->len; i++) {
if (i > 0)
g_string_append (str, ", ");
slave = slaves->pdata[i];
for (j = 0; j < net_devices->len; j++) {
net_device = net_devices->pdata[j];
if (slave == net_device_get_nm_device (net_device)) {
g_string_append (str, net_object_get_title (NET_OBJECT (net_device)));
break;
}
}
if (j == net_devices->len)
g_string_append (str, nm_device_get_iface (slave));
}
priv->slaves = g_string_free (str, FALSE);
g_object_notify (G_OBJECT (device_team), "slaves");
}
static void
net_device_team_device_set (NetVirtualDevice *virtual_device,
NMDevice *nm_device)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (virtual_device);
g_signal_connect_object (nm_device, "notify::slaves",
G_CALLBACK (nm_device_slaves_changed), device_team, 0);
nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_team);
}
static void
net_device_team_device_unset (NetVirtualDevice *virtual_device,
NMDevice *nm_device)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (virtual_device);
g_signal_handlers_disconnect_by_func (nm_device,
G_CALLBACK (nm_device_slaves_changed),
device_team);
nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_team);
}
static void
net_device_team_finalize (GObject *object)
{
NetDeviceTeam *device_team = NET_DEVICE_TEAM (object);
NetDeviceTeamPrivate *priv = device_team->priv;
g_free (priv->slaves);
G_OBJECT_CLASS (net_device_team_parent_class)->finalize (object);
}
static void
net_device_team_class_init (NetDeviceTeamClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NetVirtualDeviceClass *virtual_device_class = NET_VIRTUAL_DEVICE_CLASS (klass);
GParamSpec *pspec;
object_class->constructed = net_device_team_constructed;
object_class->finalize = net_device_team_finalize;
object_class->get_property = net_device_team_get_property;
virtual_device_class->device_set = net_device_team_device_set;
virtual_device_class->device_unset = net_device_team_device_unset;
pspec = g_param_spec_string ("slaves", NULL, NULL,
NULL,
G_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_SLAVES, pspec);
g_type_class_add_private (klass, sizeof (NetDeviceTeamPrivate));
}
static void
net_device_team_init (NetDeviceTeam *device_team)
{
device_team->priv = NET_DEVICE_TEAM_GET_PRIVATE (device_team);
}

58
panels/network/net-device-team.h
View file

@ -1,58 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2013 Red Hat, Inc.
*
* Licensed under the GNU General Public License Version 2
*
* 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.
*/
#ifndef __NET_DEVICE_TEAM_H
#define __NET_DEVICE_TEAM_H
#include <glib-object.h>
#include "net-virtual-device.h"
G_BEGIN_DECLS
#define NET_TYPE_DEVICE_TEAM (net_device_team_get_type ())
#define NET_DEVICE_TEAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeam))
#define NET_DEVICE_TEAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NET_TYPE_DEVICE_TEAM, NetDeviceTeamClass))
#define NET_IS_DEVICE_TEAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NET_TYPE_DEVICE_TEAM))
#define NET_IS_DEVICE_TEAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NET_TYPE_DEVICE_TEAM))
#define NET_DEVICE_TEAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeamClass))
typedef struct _NetDeviceTeamPrivate NetDeviceTeamPrivate;
typedef struct _NetDeviceTeam NetDeviceTeam;
typedef struct _NetDeviceTeamClass NetDeviceTeamClass;
struct _NetDeviceTeam
{
NetVirtualDevice parent;
NetDeviceTeamPrivate *priv;
};
struct _NetDeviceTeamClass
{
NetVirtualDeviceClass parent_class;
};
GType net_device_team_get_type (void);
G_END_DECLS
#endif /* __NET_DEVICE_TEAM_H */

1
po/POTFILES.in
View file

@ -78,7 +78,6 @@ panels/network/connection-editor/vpn-helpers.c
panels/network/gnome-network-panel.desktop.in.in
panels/network/net-device-ethernet.c
panels/network/net-device-mobile.c
panels/network/net-device-team.c
panels/network/net-device-wifi.c
panels/network/net-proxy.c
panels/network/net-virtual-device.c