2011-02-02 01:38:33 -05:00
|
|
|
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
2010-12-14 10:23:26 +00:00
|
|
|
*
|
2012-07-16 17:34:24 +01:00
|
|
|
* Copyright (C) 2010-2012 Richard Hughes <richard@hughsie.com>
|
2012-06-12 00:56:37 +02:00
|
|
|
* Copyright (C) 2012 Thomas Bechtold <thomasbechtold@jpberlin.de>
|
2013-02-04 15:41:37 +01:00
|
|
|
* Copyright (C) 2013 Aleksander Morgado <aleksander@gnu.org>
|
2010-12-14 10:23:26 +00:00
|
|
|
*
|
|
|
|
* 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
|
2014-01-23 12:57:27 +01:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2010-12-14 10:23:26 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2011-03-02 18:40:44 +01:00
|
|
|
#include <config.h>
|
2010-12-14 10:23:26 +00:00
|
|
|
#include <glib/gi18n.h>
|
2011-02-21 10:05:22 +00:00
|
|
|
#include <stdlib.h>
|
2010-12-14 10:23:26 +00:00
|
|
|
|
2018-03-27 18:00:43 -03:00
|
|
|
#include "shell/cc-object-storage.h"
|
|
|
|
|
2010-12-14 10:23:26 +00:00
|
|
|
#include "cc-network-panel.h"
|
2013-01-04 15:34:11 +01:00
|
|
|
#include "cc-network-resources.h"
|
2010-12-14 10:23:26 +00:00
|
|
|
|
2016-04-29 16:05:54 +02:00
|
|
|
#include <NetworkManager.h>
|
2011-02-21 10:05:22 +00:00
|
|
|
|
2022-11-04 17:40:24 +05:30
|
|
|
#include "cc-list-row.h"
|
|
|
|
#include "cc-net-proxy-page.h"
|
2019-10-23 11:15:00 +13:00
|
|
|
#include "net-device-bluetooth.h"
|
|
|
|
#include "net-device-ethernet.h"
|
2012-07-20 09:21:57 +01:00
|
|
|
#include "net-device-mobile.h"
|
2012-07-20 12:05:10 +01:00
|
|
|
#include "net-device-wifi.h"
|
2011-03-11 12:28:14 +00:00
|
|
|
#include "net-vpn.h"
|
|
|
|
|
2011-02-21 10:05:22 +00:00
|
|
|
#include "panel-common.h"
|
2010-12-15 19:22:15 +00:00
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
#include "network-dialogs.h"
|
2013-01-09 17:41:48 -05:00
|
|
|
#include "connection-editor/net-connection-editor.h"
|
2011-08-22 18:12:00 +02:00
|
|
|
|
2013-02-04 15:41:37 +01:00
|
|
|
#include <libmm-glib.h>
|
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
typedef enum {
|
|
|
|
OPERATION_NULL,
|
|
|
|
OPERATION_SHOW_DEVICE,
|
|
|
|
OPERATION_CONNECT_MOBILE
|
|
|
|
} CmdlineOperation;
|
|
|
|
|
2017-07-12 10:16:12 -03:00
|
|
|
struct _CcNetworkPanel
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2017-07-12 10:16:12 -03:00
|
|
|
CcPanel parent;
|
|
|
|
|
2019-10-24 13:04:14 +13:00
|
|
|
GPtrArray *bluetooth_devices;
|
|
|
|
GPtrArray *ethernet_devices;
|
|
|
|
GPtrArray *mobile_devices;
|
|
|
|
GPtrArray *vpns;
|
2019-10-24 12:25:34 +13:00
|
|
|
GHashTable *nm_device_to_device;
|
2019-10-24 13:04:14 +13:00
|
|
|
|
2011-03-15 16:33:01 -04:00
|
|
|
NMClient *client;
|
2013-02-04 15:41:37 +01:00
|
|
|
MMManager *modem_manager;
|
2011-03-15 16:33:01 -04:00
|
|
|
gboolean updating_device;
|
2012-11-09 11:16:07 +01:00
|
|
|
|
2017-07-12 11:08:39 -03:00
|
|
|
/* widgets */
|
2019-10-23 11:15:00 +13:00
|
|
|
GtkWidget *box_bluetooth;
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
GtkWidget *box_vpn;
|
|
|
|
GtkWidget *box_wired;
|
2019-10-23 11:15:00 +13:00
|
|
|
GtkWidget *container_bluetooth;
|
2017-07-21 14:39:27 -03:00
|
|
|
GtkWidget *empty_listbox;
|
2022-11-04 17:40:24 +05:30
|
|
|
GtkWidget *proxy_row;
|
|
|
|
GtkWidget *save_button;
|
2022-01-27 04:08:58 -08:00
|
|
|
GtkWidget *vpn_stack;
|
2023-11-22 17:35:53 -03:00
|
|
|
GtkWidget *toolbar_view;
|
2017-07-12 11:08:39 -03:00
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
/* wireless dialog stuff */
|
|
|
|
CmdlineOperation arg_operation;
|
|
|
|
gchar *arg_device;
|
|
|
|
gchar *arg_access_point;
|
|
|
|
gboolean operation_done;
|
2010-12-14 10:23:26 +00:00
|
|
|
};
|
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
enum {
|
|
|
|
PROP_0,
|
2013-03-01 11:18:08 +01:00
|
|
|
PROP_PARAMETERS
|
2011-08-22 18:12:00 +02:00
|
|
|
};
|
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
static void handle_argv (CcNetworkPanel *self);
|
2022-09-24 00:24:35 +02:00
|
|
|
static void device_managed_cb (CcNetworkPanel *self, GParamSpec *pspec, NMDevice *device);
|
2010-12-16 10:33:38 +00:00
|
|
|
|
2017-07-12 10:16:12 -03:00
|
|
|
CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
|
|
|
|
|
2010-12-14 10:23:26 +00:00
|
|
|
static void
|
|
|
|
cc_network_panel_get_property (GObject *object,
|
2011-01-24 15:46:58 -05:00
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2011-01-24 15:46:58 -05:00
|
|
|
switch (property_id) {
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
|
|
}
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
static CmdlineOperation
|
|
|
|
cmdline_operation_from_string (const gchar *string)
|
|
|
|
{
|
|
|
|
if (g_strcmp0 (string, "connect-3g") == 0)
|
|
|
|
return OPERATION_CONNECT_MOBILE;
|
|
|
|
if (g_strcmp0 (string, "show-device") == 0)
|
|
|
|
return OPERATION_SHOW_DEVICE;
|
|
|
|
|
|
|
|
g_warning ("Invalid additional argument %s", string);
|
|
|
|
return OPERATION_NULL;
|
|
|
|
}
|
|
|
|
|
2012-09-27 20:22:57 +02:00
|
|
|
static void
|
|
|
|
reset_command_line_args (CcNetworkPanel *self)
|
|
|
|
{
|
2017-07-12 10:16:12 -03:00
|
|
|
self->arg_operation = OPERATION_NULL;
|
|
|
|
g_clear_pointer (&self->arg_device, g_free);
|
|
|
|
g_clear_pointer (&self->arg_access_point, g_free);
|
2012-09-27 20:22:57 +02:00
|
|
|
}
|
|
|
|
|
2012-10-03 14:49:23 +02:00
|
|
|
static gboolean
|
|
|
|
verify_argv (CcNetworkPanel *self,
|
|
|
|
const char **args)
|
|
|
|
{
|
2017-07-12 10:16:12 -03:00
|
|
|
switch (self->arg_operation) {
|
2012-10-03 14:49:23 +02:00
|
|
|
case OPERATION_CONNECT_MOBILE:
|
|
|
|
case OPERATION_SHOW_DEVICE:
|
2017-07-12 10:16:12 -03:00
|
|
|
if (self->arg_device == NULL) {
|
2012-10-03 14:49:23 +02:00
|
|
|
g_warning ("Operation %s requires an object path", args[0]);
|
2012-10-16 14:36:16 -04:00
|
|
|
return FALSE;
|
|
|
|
}
|
2012-10-03 14:49:23 +02:00
|
|
|
default:
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 11:18:08 +01:00
|
|
|
static GPtrArray *
|
|
|
|
variant_av_to_string_array (GVariant *array)
|
|
|
|
{
|
|
|
|
GVariantIter iter;
|
|
|
|
GVariant *v;
|
|
|
|
GPtrArray *strv;
|
|
|
|
gsize count;
|
|
|
|
count = g_variant_iter_init (&iter, array);
|
|
|
|
strv = g_ptr_array_sized_new (count + 1);
|
|
|
|
while (g_variant_iter_next (&iter, "v", &v)) {
|
2017-07-21 11:52:13 -03:00
|
|
|
g_ptr_array_add (strv, (gpointer)g_variant_get_string (v, NULL));
|
2013-03-01 11:18:08 +01:00
|
|
|
g_variant_unref (v);
|
|
|
|
}
|
|
|
|
g_ptr_array_add (strv, NULL); /* NULL-terminate the strv data array */
|
|
|
|
return strv;
|
|
|
|
}
|
|
|
|
|
2010-12-14 10:23:26 +00:00
|
|
|
static void
|
|
|
|
cc_network_panel_set_property (GObject *object,
|
2011-01-24 15:46:58 -05:00
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2011-08-22 18:12:00 +02:00
|
|
|
CcNetworkPanel *self = CC_NETWORK_PANEL (object);
|
|
|
|
|
2011-01-24 15:46:58 -05:00
|
|
|
switch (property_id) {
|
2013-03-01 11:18:08 +01:00
|
|
|
case PROP_PARAMETERS: {
|
|
|
|
GVariant *parameters;
|
2011-09-08 15:43:23 +01:00
|
|
|
|
2012-09-27 20:22:57 +02:00
|
|
|
reset_command_line_args (self);
|
2011-09-08 15:43:23 +01:00
|
|
|
|
2013-03-01 11:18:08 +01:00
|
|
|
parameters = g_value_get_variant (value);
|
|
|
|
if (parameters) {
|
2019-09-12 11:53:42 +12:00
|
|
|
g_autoptr(GPtrArray) array = NULL;
|
2013-03-01 11:18:08 +01:00
|
|
|
const gchar **args;
|
|
|
|
array = variant_av_to_string_array (parameters);
|
2013-09-09 15:52:21 +02:00
|
|
|
args = (const gchar **) array->pdata;
|
2011-09-08 15:43:23 +01:00
|
|
|
|
2011-08-22 18:12:00 +02:00
|
|
|
g_debug ("Invoked with operation %s", args[0]);
|
|
|
|
|
|
|
|
if (args[0])
|
2017-07-12 10:16:12 -03:00
|
|
|
self->arg_operation = cmdline_operation_from_string (args[0]);
|
2011-08-22 18:12:00 +02:00
|
|
|
if (args[0] && args[1])
|
2017-07-12 10:16:12 -03:00
|
|
|
self->arg_device = g_strdup (args[1]);
|
2011-08-22 18:12:00 +02:00
|
|
|
if (args[0] && args[1] && args[2])
|
2017-07-12 10:16:12 -03:00
|
|
|
self->arg_access_point = g_strdup (args[2]);
|
2012-09-27 21:07:53 +02:00
|
|
|
|
2012-10-03 14:49:23 +02:00
|
|
|
if (verify_argv (self, (const char **) args) == FALSE) {
|
|
|
|
reset_command_line_args (self);
|
|
|
|
return;
|
|
|
|
}
|
2012-10-01 23:05:29 +02:00
|
|
|
g_debug ("Calling handle_argv() after setting property");
|
2012-09-27 21:07:53 +02:00
|
|
|
handle_argv (self);
|
2011-08-22 18:12:00 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-24 15:46:58 -05:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
|
|
}
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
cc_network_panel_dispose (GObject *object)
|
|
|
|
{
|
2017-07-12 10:16:12 -03:00
|
|
|
CcNetworkPanel *self = CC_NETWORK_PANEL (object);
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2017-07-12 10:16:12 -03:00
|
|
|
g_clear_object (&self->client);
|
|
|
|
g_clear_object (&self->modem_manager);
|
2012-06-13 23:18:39 -04:00
|
|
|
|
2019-10-24 13:04:14 +13:00
|
|
|
g_clear_pointer (&self->bluetooth_devices, g_ptr_array_unref);
|
|
|
|
g_clear_pointer (&self->ethernet_devices, g_ptr_array_unref);
|
|
|
|
g_clear_pointer (&self->mobile_devices, g_ptr_array_unref);
|
|
|
|
g_clear_pointer (&self->vpns, g_ptr_array_unref);
|
2019-10-24 12:25:34 +13:00
|
|
|
g_clear_pointer (&self->nm_device_to_device, g_hash_table_destroy);
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
|
2011-01-24 15:46:58 -05:00
|
|
|
G_OBJECT_CLASS (cc_network_panel_parent_class)->dispose (object);
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
cc_network_panel_finalize (GObject *object)
|
|
|
|
{
|
2019-10-18 11:47:17 +13:00
|
|
|
CcNetworkPanel *self = CC_NETWORK_PANEL (object);
|
2012-09-27 20:26:50 +02:00
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
reset_command_line_args (self);
|
2011-08-22 18:12:00 +02:00
|
|
|
|
2011-01-24 15:46:58 -05:00
|
|
|
G_OBJECT_CLASS (cc_network_panel_parent_class)->finalize (object);
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|
|
|
|
|
2012-05-18 17:04:58 +02:00
|
|
|
static const char *
|
2023-05-31 15:11:51 +12:00
|
|
|
cc_network_panel_get_help_uri (CcPanel *panel)
|
2012-05-18 17:04:58 +02:00
|
|
|
{
|
|
|
|
return "help:gnome-help/net";
|
|
|
|
}
|
|
|
|
|
2019-10-24 11:08:41 +13:00
|
|
|
static void
|
|
|
|
panel_refresh_device_titles (CcNetworkPanel *self)
|
2012-09-27 16:15:19 -04:00
|
|
|
{
|
2019-10-24 11:08:41 +13:00
|
|
|
g_autoptr(GPtrArray) ndarray = NULL;
|
|
|
|
g_autoptr(GPtrArray) nmdarray = NULL;
|
2019-10-24 14:30:28 +13:00
|
|
|
GtkWidget **devices;
|
2019-10-24 11:08:41 +13:00
|
|
|
NMDevice **nm_devices;
|
|
|
|
g_auto(GStrv) titles = NULL;
|
|
|
|
guint i, num_devices;
|
2012-10-18 07:23:42 -04:00
|
|
|
|
2019-10-24 11:08:41 +13:00
|
|
|
ndarray = g_ptr_array_new ();
|
|
|
|
nmdarray = g_ptr_array_new ();
|
2019-10-24 13:04:14 +13:00
|
|
|
for (i = 0; i < self->bluetooth_devices->len; i++) {
|
|
|
|
NetDeviceBluetooth *device = g_ptr_array_index (self->bluetooth_devices, i);
|
|
|
|
g_ptr_array_add (ndarray, device);
|
|
|
|
g_ptr_array_add (nmdarray, net_device_bluetooth_get_device (device));
|
|
|
|
}
|
|
|
|
for (i = 0; i < self->ethernet_devices->len; i++) {
|
|
|
|
NetDeviceEthernet *device = g_ptr_array_index (self->ethernet_devices, i);
|
|
|
|
g_ptr_array_add (ndarray, device);
|
|
|
|
g_ptr_array_add (nmdarray, net_device_ethernet_get_device (device));
|
|
|
|
}
|
|
|
|
for (i = 0; i < self->mobile_devices->len; i++) {
|
|
|
|
NetDeviceMobile *device = g_ptr_array_index (self->mobile_devices, i);
|
|
|
|
g_ptr_array_add (ndarray, device);
|
|
|
|
g_ptr_array_add (nmdarray, net_device_mobile_get_device (device));
|
2017-02-13 21:39:18 +01:00
|
|
|
}
|
|
|
|
|
2019-10-24 11:08:41 +13:00
|
|
|
if (ndarray->len == 0)
|
2012-09-27 16:15:19 -04:00
|
|
|
return;
|
2012-10-18 07:23:42 -04:00
|
|
|
|
2019-10-24 14:30:28 +13:00
|
|
|
devices = (GtkWidget **)ndarray->pdata;
|
2012-09-27 16:15:19 -04:00
|
|
|
nm_devices = (NMDevice **)nmdarray->pdata;
|
|
|
|
num_devices = ndarray->len;
|
|
|
|
|
2016-04-29 16:05:54 +02:00
|
|
|
titles = nm_device_disambiguate_names (nm_devices, num_devices);
|
2012-09-27 16:15:19 -04:00
|
|
|
for (i = 0; i < num_devices; i++) {
|
2019-03-21 14:24:04 +01:00
|
|
|
if (NM_IS_DEVICE_BT (nm_devices[i]))
|
2022-01-27 04:35:07 -08:00
|
|
|
adw_preferences_row_set_title (ADW_PREFERENCES_ROW (devices[i]), nm_device_bt_get_name (NM_DEVICE_BT (nm_devices[i])));
|
2019-10-24 13:42:25 +13:00
|
|
|
else if (NET_IS_DEVICE_ETHERNET (devices[i]))
|
2022-01-27 14:52:21 -08:00
|
|
|
adw_preferences_group_set_title (ADW_PREFERENCES_GROUP (devices[i]), titles[i]);
|
2019-10-24 13:42:25 +13:00
|
|
|
else if (NET_IS_DEVICE_MOBILE (devices[i]))
|
|
|
|
net_device_mobile_set_title (NET_DEVICE_MOBILE (devices[i]), titles[i]);
|
2012-09-27 16:15:19 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-27 21:07:53 +02:00
|
|
|
static gboolean
|
2017-07-12 10:16:12 -03:00
|
|
|
handle_argv_for_device (CcNetworkPanel *self,
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
NMDevice *device)
|
2012-09-27 21:07:53 +02:00
|
|
|
{
|
2017-07-12 10:16:12 -03:00
|
|
|
GtkWidget *toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)));
|
2012-09-27 21:07:53 +02:00
|
|
|
|
2017-07-12 10:16:12 -03:00
|
|
|
if (self->arg_operation == OPERATION_NULL)
|
2012-09-27 21:07:53 +02:00
|
|
|
return TRUE;
|
|
|
|
|
2017-07-12 10:22:46 -03:00
|
|
|
if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), self->arg_device) == 0) {
|
2017-07-12 10:16:12 -03:00
|
|
|
if (self->arg_operation == OPERATION_CONNECT_MOBILE) {
|
|
|
|
cc_network_panel_connect_to_3g_network (toplevel, self->client, device);
|
2012-09-27 21:07:53 +02:00
|
|
|
|
2017-07-12 10:16:12 -03:00
|
|
|
reset_command_line_args (self); /* done */
|
2012-09-27 21:07:53 +02:00
|
|
|
return TRUE;
|
2017-07-12 10:22:46 -03:00
|
|
|
} else if (self->arg_operation == OPERATION_SHOW_DEVICE) {
|
2017-07-12 10:16:12 -03:00
|
|
|
reset_command_line_args (self); /* done */
|
2012-09-27 21:07:53 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-02-17 14:50:51 +01:00
|
|
|
static gboolean
|
2019-10-18 11:47:17 +13:00
|
|
|
handle_argv_for_connection (CcNetworkPanel *self,
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
NMConnection *connection)
|
2014-02-17 14:50:51 +01:00
|
|
|
{
|
2019-10-18 11:47:17 +13:00
|
|
|
if (self->arg_operation == OPERATION_NULL)
|
2014-02-17 14:50:51 +01:00
|
|
|
return TRUE;
|
2019-10-18 11:47:17 +13:00
|
|
|
if (self->arg_operation != OPERATION_SHOW_DEVICE)
|
2014-02-17 14:50:51 +01:00
|
|
|
return FALSE;
|
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
if (g_strcmp0 (nm_connection_get_path (connection), self->arg_device) == 0) {
|
|
|
|
reset_command_line_args (self);
|
2014-02-17 14:50:51 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-27 21:07:53 +02:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
handle_argv (CcNetworkPanel *self)
|
2012-09-27 21:07:53 +02:00
|
|
|
{
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
gint i;
|
2012-09-27 21:07:53 +02:00
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
if (self->arg_operation == OPERATION_NULL)
|
2012-09-27 21:07:53 +02:00
|
|
|
return;
|
|
|
|
|
2019-10-24 13:04:14 +13:00
|
|
|
for (i = 0; i < self->bluetooth_devices->len; i++) {
|
|
|
|
NetDeviceBluetooth *device = g_ptr_array_index (self->bluetooth_devices, i);
|
|
|
|
if (handle_argv_for_device (self, net_device_bluetooth_get_device (device)))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (i = 0; i < self->ethernet_devices->len; i++) {
|
|
|
|
NetDeviceEthernet *device = g_ptr_array_index (self->ethernet_devices, i);
|
|
|
|
if (handle_argv_for_device (self, net_device_ethernet_get_device (device)))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (i = 0; i < self->mobile_devices->len; i++) {
|
|
|
|
NetDeviceMobile *device = g_ptr_array_index (self->mobile_devices, i);
|
|
|
|
if (handle_argv_for_device (self, net_device_mobile_get_device (device)))
|
2019-10-24 11:44:42 +13:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (i = 0; i < self->vpns->len; i++) {
|
|
|
|
NetVpn *vpn = g_ptr_array_index (self->vpns, i);
|
|
|
|
if (handle_argv_for_connection (self, net_vpn_get_connection (vpn)))
|
2012-10-01 23:03:54 +02:00
|
|
|
return;
|
2012-09-27 21:07:53 +02:00
|
|
|
}
|
2012-10-01 23:05:29 +02:00
|
|
|
|
|
|
|
g_debug ("Could not handle argv operation, no matching device yet?");
|
2012-09-27 21:07:53 +02:00
|
|
|
}
|
|
|
|
|
2017-07-21 14:39:27 -03:00
|
|
|
static void
|
|
|
|
update_vpn_section (CcNetworkPanel *self)
|
|
|
|
{
|
2022-01-27 04:08:58 -08:00
|
|
|
gtk_stack_set_visible_child (GTK_STACK (self->vpn_stack),
|
|
|
|
self->vpns->len == 0 ? self->empty_listbox : self->box_vpn);
|
2017-07-21 14:39:27 -03:00
|
|
|
}
|
|
|
|
|
2017-08-22 23:04:52 -03:00
|
|
|
static void
|
2019-10-23 11:15:00 +13:00
|
|
|
update_bluetooth_section (CcNetworkPanel *self)
|
2017-08-22 23:04:52 -03:00
|
|
|
{
|
2019-10-24 13:04:14 +13:00
|
|
|
gtk_widget_set_visible (self->container_bluetooth, self->bluetooth_devices->len > 0);
|
2017-08-22 23:04:52 -03:00
|
|
|
}
|
|
|
|
|
2019-10-04 16:02:23 +05:30
|
|
|
static gboolean
|
|
|
|
wwan_panel_supports_modem (GDBusObject *object)
|
|
|
|
{
|
|
|
|
MMObject *mm_object;
|
|
|
|
MMModem *modem;
|
|
|
|
MMModemCapability capability, supported_capabilities;
|
|
|
|
|
|
|
|
g_assert (G_IS_DBUS_OBJECT (object));
|
|
|
|
|
|
|
|
supported_capabilities = MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_LTE;
|
|
|
|
#if MM_CHECK_VERSION (1,14,0)
|
|
|
|
supported_capabilities |= MM_MODEM_CAPABILITY_5GNR;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
mm_object = MM_OBJECT (object);
|
|
|
|
modem = mm_object_get_modem (mm_object);
|
|
|
|
capability = mm_modem_get_current_capabilities (modem);
|
|
|
|
|
|
|
|
return capability & supported_capabilities;
|
|
|
|
}
|
|
|
|
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_add_device (CcNetworkPanel *self, NMDevice *device)
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2011-02-21 10:05:22 +00:00
|
|
|
NMDeviceType type;
|
2019-10-24 14:30:28 +13:00
|
|
|
NetDeviceEthernet *device_ethernet;
|
|
|
|
NetDeviceMobile *device_mobile;
|
|
|
|
NetDeviceBluetooth *device_bluetooth;
|
2019-10-23 14:56:18 +13:00
|
|
|
g_autoptr(GDBusObject) modem_object = NULL;
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2019-10-23 12:45:07 +13:00
|
|
|
/* does already exist */
|
2019-10-24 14:30:28 +13:00
|
|
|
if (g_hash_table_lookup (self->nm_device_to_device, device) != NULL)
|
2019-10-24 12:25:34 +13:00
|
|
|
return;
|
2014-09-08 14:29:21 +02:00
|
|
|
|
2011-03-31 16:05:12 +01:00
|
|
|
type = nm_device_get_device_type (device);
|
|
|
|
|
2012-09-21 16:07:46 -04:00
|
|
|
g_debug ("device %s type %i path %s",
|
2019-10-23 12:45:07 +13:00
|
|
|
nm_device_get_udi (device), type, nm_object_get_path (NM_OBJECT (device)));
|
2011-02-21 10:05:22 +00:00
|
|
|
|
2017-06-20 15:40:51 +02:00
|
|
|
/* map the NMDeviceType to the GType, or ignore */
|
2012-07-18 15:08:07 +01:00
|
|
|
switch (type) {
|
|
|
|
case NM_DEVICE_TYPE_ETHERNET:
|
2019-04-23 19:46:32 +02:00
|
|
|
case NM_DEVICE_TYPE_INFINIBAND:
|
2019-10-24 14:30:28 +13:00
|
|
|
device_ethernet = net_device_ethernet_new (self->client, device);
|
2021-11-29 10:37:01 -03:00
|
|
|
gtk_box_append (GTK_BOX (self->box_wired), GTK_WIDGET (device_ethernet));
|
2019-10-24 14:30:28 +13:00
|
|
|
g_ptr_array_add (self->ethernet_devices, device_ethernet);
|
|
|
|
g_hash_table_insert (self->nm_device_to_device, device, device_ethernet);
|
2012-07-18 15:08:07 +01:00
|
|
|
break;
|
2012-07-20 09:21:57 +01:00
|
|
|
case NM_DEVICE_TYPE_MODEM:
|
2019-10-23 14:56:18 +13:00
|
|
|
if (g_str_has_prefix (nm_device_get_udi (device), "/org/freedesktop/ModemManager1/Modem/")) {
|
|
|
|
if (self->modem_manager == NULL) {
|
|
|
|
g_warning ("Cannot grab information for modem at %s: No ModemManager support",
|
|
|
|
nm_device_get_udi (device));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
modem_object = g_dbus_object_manager_get_object (G_DBUS_OBJECT_MANAGER (self->modem_manager),
|
|
|
|
nm_device_get_udi (device));
|
|
|
|
if (modem_object == NULL) {
|
|
|
|
g_warning ("Cannot grab information for modem at %s: Not found",
|
|
|
|
nm_device_get_udi (device));
|
|
|
|
return;
|
|
|
|
}
|
2019-10-04 16:02:23 +05:30
|
|
|
|
|
|
|
/* This will be handled by cellular panel */
|
|
|
|
if (wwan_panel_supports_modem (modem_object))
|
|
|
|
return;
|
2019-10-23 14:56:18 +13:00
|
|
|
}
|
|
|
|
|
2019-10-24 14:30:28 +13:00
|
|
|
device_mobile = net_device_mobile_new (self->client, device, modem_object);
|
2021-11-29 10:37:01 -03:00
|
|
|
gtk_box_append (GTK_BOX (self->box_wired), GTK_WIDGET (device_mobile));
|
2019-10-24 14:30:28 +13:00
|
|
|
g_ptr_array_add (self->mobile_devices, device_mobile);
|
|
|
|
g_hash_table_insert (self->nm_device_to_device, device, device_mobile);
|
2012-07-20 09:21:57 +01:00
|
|
|
break;
|
2019-03-21 14:22:12 +01:00
|
|
|
case NM_DEVICE_TYPE_BT:
|
2019-10-24 14:30:28 +13:00
|
|
|
device_bluetooth = net_device_bluetooth_new (self->client, device);
|
2022-01-27 04:35:07 -08:00
|
|
|
gtk_list_box_append (GTK_LIST_BOX (self->box_bluetooth), GTK_WIDGET (device_bluetooth));
|
2019-10-24 14:30:28 +13:00
|
|
|
g_ptr_array_add (self->bluetooth_devices, device_bluetooth);
|
|
|
|
g_hash_table_insert (self->nm_device_to_device, device, device_bluetooth);
|
|
|
|
|
|
|
|
/* Update the device_bluetooth section if we're adding a bluetooth
|
|
|
|
* device. This is a temporary solution though, for these will
|
|
|
|
* be handled by the future Mobile Broadband panel */
|
|
|
|
update_bluetooth_section (self);
|
2019-03-21 14:22:12 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* For Wi-Fi and VPN we handle connections separately; we correctly manage
|
|
|
|
* them, but not here.
|
|
|
|
*/
|
2012-07-20 12:05:10 +01:00
|
|
|
case NM_DEVICE_TYPE_WIFI:
|
2017-06-20 15:40:51 +02:00
|
|
|
case NM_DEVICE_TYPE_TUN:
|
2019-03-21 14:22:12 +01:00
|
|
|
/* And the rest we simply cannot deal with currently. */
|
2012-07-18 15:08:07 +01:00
|
|
|
default:
|
2019-03-21 14:22:12 +01:00
|
|
|
return;
|
2012-07-18 15:08:07 +01:00
|
|
|
}
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|
|
|
|
|
2010-12-16 10:33:38 +00:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_remove_device (CcNetworkPanel *self, NMDevice *device)
|
2012-09-27 16:15:19 -04:00
|
|
|
{
|
2019-10-24 14:30:28 +13:00
|
|
|
GtkWidget *net_device;
|
2012-09-27 16:15:19 -04:00
|
|
|
|
2019-10-24 12:25:34 +13:00
|
|
|
net_device = g_hash_table_lookup (self->nm_device_to_device, device);
|
|
|
|
if (net_device == NULL)
|
|
|
|
return;
|
2017-07-11 13:02:51 -03:00
|
|
|
|
2019-10-24 13:04:14 +13:00
|
|
|
g_ptr_array_remove (self->bluetooth_devices, net_device);
|
|
|
|
g_ptr_array_remove (self->ethernet_devices, net_device);
|
|
|
|
g_ptr_array_remove (self->mobile_devices, net_device);
|
2019-10-24 12:25:34 +13:00
|
|
|
g_hash_table_remove (self->nm_device_to_device, device);
|
2017-07-21 14:39:27 -03:00
|
|
|
|
2021-11-29 10:37:01 -03:00
|
|
|
gtk_box_remove (GTK_BOX (gtk_widget_get_parent (net_device)), net_device);
|
2019-10-24 14:30:28 +13:00
|
|
|
|
2017-07-21 14:39:27 -03:00
|
|
|
/* update vpn widgets */
|
2019-10-18 11:47:17 +13:00
|
|
|
update_vpn_section (self);
|
2017-08-22 23:04:52 -03:00
|
|
|
|
2019-10-23 11:15:00 +13:00
|
|
|
/* update device_bluetooth widgets */
|
|
|
|
update_bluetooth_section (self);
|
2011-03-15 21:30:32 -04:00
|
|
|
}
|
|
|
|
|
2011-03-14 19:21:54 -04:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
connection_state_changed (CcNetworkPanel *self)
|
2011-03-14 19:21:54 -04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
active_connections_changed (CcNetworkPanel *self)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
const GPtrArray *connections;
|
|
|
|
int i, j;
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
g_debug ("Active connections changed:");
|
2019-10-18 11:47:17 +13:00
|
|
|
connections = nm_client_get_active_connections (self->client);
|
2012-07-20 12:05:10 +01:00
|
|
|
for (i = 0; connections && (i < connections->len); i++) {
|
|
|
|
NMActiveConnection *connection;
|
|
|
|
const GPtrArray *devices;
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
connection = g_ptr_array_index (connections, i);
|
|
|
|
g_debug (" %s", nm_object_get_path (NM_OBJECT (connection)));
|
|
|
|
devices = nm_active_connection_get_devices (connection);
|
|
|
|
for (j = 0; devices && j < devices->len; j++)
|
|
|
|
g_debug (" %s", nm_device_get_udi (g_ptr_array_index (devices, j)));
|
2022-09-24 00:24:35 +02:00
|
|
|
|
|
|
|
if (nm_is_wireguard_connection (connection))
|
|
|
|
g_debug (" WireGuard connection: %s", nm_active_connection_get_id(connection));
|
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
if (NM_IS_VPN_CONNECTION (connection))
|
2016-04-29 16:05:54 +02:00
|
|
|
g_debug (" VPN base connection: %s", nm_active_connection_get_specific_object_path (connection));
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
if (g_object_get_data (G_OBJECT (connection), "has-state-changed-handler") == NULL) {
|
|
|
|
g_signal_connect_object (connection, "notify::state",
|
2019-10-18 11:47:17 +13:00
|
|
|
G_CALLBACK (connection_state_changed), self, G_CONNECT_SWAPPED);
|
2012-07-20 12:05:10 +01:00
|
|
|
g_object_set_data (G_OBJECT (connection), "has-state-changed-handler", GINT_TO_POINTER (TRUE));
|
|
|
|
}
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
static void
|
2020-11-05 17:04:36 +13:00
|
|
|
device_managed_cb (CcNetworkPanel *self, GParamSpec *pspec, NMDevice *device)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2020-11-05 17:04:36 +13:00
|
|
|
if (!nm_device_get_managed (device))
|
|
|
|
return;
|
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_add_device (self, device);
|
|
|
|
panel_refresh_device_titles (self);
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
|
2020-11-05 17:04:36 +13:00
|
|
|
static void
|
|
|
|
device_added_cb (CcNetworkPanel *self, NMDevice *device)
|
|
|
|
{
|
|
|
|
g_debug ("New device added");
|
|
|
|
|
|
|
|
if (nm_device_get_managed (device))
|
|
|
|
device_managed_cb (self, NULL, device);
|
|
|
|
else
|
|
|
|
g_signal_connect_object (device, "notify::managed", G_CALLBACK (device_managed_cb), self, G_CONNECT_SWAPPED);
|
|
|
|
}
|
|
|
|
|
2011-05-24 07:28:31 -04:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
device_removed_cb (CcNetworkPanel *self, NMDevice *device)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
g_debug ("Device removed");
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_remove_device (self, device);
|
|
|
|
panel_refresh_device_titles (self);
|
2020-11-05 17:04:36 +13:00
|
|
|
|
|
|
|
g_signal_handlers_disconnect_by_func (device,
|
|
|
|
G_CALLBACK (device_managed_cb),
|
|
|
|
self);
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
manager_running (CcNetworkPanel *self)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
const GPtrArray *devices;
|
|
|
|
int i;
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
/* clear all devices we added */
|
2019-10-18 11:47:17 +13:00
|
|
|
if (!nm_client_get_nm_running (self->client)) {
|
2012-07-20 12:05:10 +01:00
|
|
|
g_debug ("NM disappeared");
|
2011-03-26 16:45:08 -04:00
|
|
|
goto out;
|
2011-03-16 23:41:56 -04:00
|
|
|
}
|
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
g_debug ("coldplugging devices");
|
2019-10-18 11:47:17 +13:00
|
|
|
devices = nm_client_get_devices (self->client);
|
2012-07-20 12:05:10 +01:00
|
|
|
if (devices == NULL) {
|
|
|
|
g_debug ("No devices to add");
|
|
|
|
return;
|
2011-03-16 23:41:56 -04:00
|
|
|
}
|
2012-07-20 12:05:10 +01:00
|
|
|
for (i = 0; i < devices->len; i++) {
|
2020-11-05 17:04:36 +13:00
|
|
|
NMDevice *device = g_ptr_array_index (devices, i);
|
|
|
|
device_added_cb (self, device);
|
2011-02-08 12:00:19 +00:00
|
|
|
}
|
2012-07-20 12:05:10 +01:00
|
|
|
out:
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_refresh_device_titles (self);
|
2012-09-27 16:15:19 -04:00
|
|
|
|
2012-10-01 23:05:29 +02:00
|
|
|
g_debug ("Calling handle_argv() after cold-plugging devices");
|
2019-10-18 11:47:17 +13:00
|
|
|
handle_argv (self);
|
2012-07-12 14:07:54 +01:00
|
|
|
}
|
|
|
|
|
2010-12-14 10:23:26 +00:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_add_vpn_device (CcNetworkPanel *self, NMConnection *connection)
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
NetVpn *net_vpn;
|
2019-10-23 12:45:07 +13:00
|
|
|
guint i;
|
2012-06-27 22:42:19 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
/* does already exist */
|
2019-10-24 11:44:42 +13:00
|
|
|
for (i = 0; i < self->vpns->len; i++) {
|
|
|
|
net_vpn = g_ptr_array_index (self->vpns, i);
|
|
|
|
if (net_vpn_get_connection (net_vpn) == connection)
|
2019-10-23 12:45:07 +13:00
|
|
|
return;
|
|
|
|
}
|
2012-06-27 22:42:19 -04:00
|
|
|
|
2019-10-24 14:25:41 +13:00
|
|
|
net_vpn = net_vpn_new (self->client, connection);
|
2022-01-27 04:08:58 -08:00
|
|
|
gtk_list_box_append (GTK_LIST_BOX (self->box_vpn), GTK_WIDGET (net_vpn));
|
2011-05-24 07:28:31 -04:00
|
|
|
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
/* store in the devices array */
|
2019-10-24 11:44:42 +13:00
|
|
|
g_ptr_array_add (self->vpns, net_vpn);
|
2017-02-13 21:36:55 +01:00
|
|
|
|
2017-07-21 14:39:27 -03:00
|
|
|
/* update vpn widgets */
|
2019-10-18 11:47:17 +13:00
|
|
|
update_vpn_section (self);
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-10-24 13:21:17 +13:00
|
|
|
add_connection (CcNetworkPanel *self, NMConnection *connection)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
NMSettingConnection *s_con;
|
2024-01-12 00:56:05 +01:00
|
|
|
const gchar *type;
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection,
|
|
|
|
NM_TYPE_SETTING_CONNECTION));
|
|
|
|
type = nm_setting_connection_get_connection_type (s_con);
|
2024-01-12 00:56:05 +01:00
|
|
|
if (g_strcmp0 (type, "vpn") != 0 && g_strcmp0 (type, "wireguard") != 0)
|
2012-07-20 12:05:10 +01:00
|
|
|
return;
|
2013-01-08 08:47:14 -05:00
|
|
|
|
2014-05-19 17:55:47 +02:00
|
|
|
/* Don't add the libvirtd bridge to the UI */
|
|
|
|
if (g_strcmp0 (nm_setting_connection_get_interface_name (s_con), "virbr0") == 0)
|
|
|
|
return;
|
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
g_debug ("add %s/%s remote connection: %s",
|
|
|
|
type, g_type_name_from_instance ((GTypeInstance*)connection),
|
|
|
|
nm_connection_get_path (connection));
|
2024-01-12 00:56:05 +01:00
|
|
|
panel_add_vpn_device (self, connection);
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-10-24 13:21:17 +13:00
|
|
|
client_connection_removed_cb (CcNetworkPanel *self, NMConnection *connection)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2019-10-24 13:21:17 +13:00
|
|
|
guint i;
|
|
|
|
|
|
|
|
for (i = 0; i < self->vpns->len; i++) {
|
|
|
|
NetVpn *vpn = g_ptr_array_index (self->vpns, i);
|
|
|
|
if (net_vpn_get_connection (vpn) == connection) {
|
2019-10-24 14:23:55 +13:00
|
|
|
g_ptr_array_remove (self->vpns, vpn);
|
2022-01-27 04:08:58 -08:00
|
|
|
gtk_list_box_remove (GTK_LIST_BOX (self->box_vpn), GTK_WIDGET (vpn));
|
2019-12-12 22:43:15 +01:00
|
|
|
update_vpn_section (self);
|
2019-10-24 13:21:17 +13:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
|
2014-12-05 18:53:11 +01:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
panel_check_network_manager_version (CcNetworkPanel *self)
|
2011-05-24 07:28:31 -04:00
|
|
|
{
|
2012-07-20 12:05:10 +01:00
|
|
|
const gchar *version;
|
2011-05-24 07:28:31 -04:00
|
|
|
|
2012-07-20 12:05:10 +01:00
|
|
|
/* parse running version */
|
2019-10-18 11:47:17 +13:00
|
|
|
version = nm_client_get_version (self->client);
|
2014-12-18 08:04:00 +01:00
|
|
|
if (version == NULL) {
|
2022-11-01 17:41:39 +05:30
|
|
|
GtkWidget *status_page;
|
|
|
|
|
|
|
|
status_page = adw_status_page_new ();
|
2023-11-22 17:35:53 -03:00
|
|
|
adw_toolbar_view_set_content (ADW_TOOLBAR_VIEW (self->toolbar_view), status_page);
|
2022-11-01 17:41:39 +05:30
|
|
|
|
|
|
|
adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page), "network-error-symbolic");
|
2023-03-16 16:00:29 -03:00
|
|
|
adw_status_page_set_title (ADW_STATUS_PAGE (status_page), _("Network Unavailable"));
|
2022-11-01 17:41:39 +05:30
|
|
|
adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
2023-03-16 16:00:29 -03:00
|
|
|
_("An error has occurred and network cannot be used."
|
|
|
|
"\n Error details: NetworkManager not running."));
|
|
|
|
|
2014-12-05 18:53:11 +01:00
|
|
|
} else {
|
2019-10-18 11:47:17 +13:00
|
|
|
manager_running (self);
|
2011-05-24 07:28:31 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-21 11:52:57 -03:00
|
|
|
static void
|
2023-05-26 11:42:19 +12:00
|
|
|
create_connection_cb (CcNetworkPanel *self)
|
2017-07-21 11:52:57 -03:00
|
|
|
{
|
|
|
|
NetConnectionEditor *editor;
|
|
|
|
|
2020-11-19 11:17:22 +13:00
|
|
|
editor = net_connection_editor_new (NULL, NULL, NULL, self->client);
|
2021-11-29 10:37:01 -03:00
|
|
|
gtk_window_set_transient_for (GTK_WINDOW (editor),
|
|
|
|
GTK_WINDOW (gtk_widget_get_native (GTK_WIDGET (self))));
|
2020-11-19 11:43:16 +13:00
|
|
|
gtk_window_present (GTK_WINDOW (editor));
|
2017-07-21 11:52:57 -03:00
|
|
|
}
|
|
|
|
|
2011-05-26 18:47:27 -04:00
|
|
|
static void
|
2021-11-29 10:37:01 -03:00
|
|
|
cc_network_panel_map (GtkWidget *widget)
|
2011-05-26 18:47:27 -04:00
|
|
|
{
|
2021-11-29 10:37:01 -03:00
|
|
|
GTK_WIDGET_CLASS (cc_network_panel_parent_class)->map (widget);
|
|
|
|
|
2014-12-18 08:04:00 +01:00
|
|
|
/* is the user compiling against a new version, but not running
|
|
|
|
* the daemon? */
|
2021-11-29 10:37:01 -03:00
|
|
|
panel_check_network_manager_version (CC_NETWORK_PANEL (widget));
|
2011-05-26 18:47:27 -04:00
|
|
|
}
|
|
|
|
|
2017-07-12 11:08:39 -03:00
|
|
|
|
|
|
|
static void
|
|
|
|
cc_network_panel_class_init (CcNetworkPanelClass *klass)
|
|
|
|
{
|
|
|
|
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
|
|
|
|
|
|
|
|
panel_class->get_help_uri = cc_network_panel_get_help_uri;
|
|
|
|
|
2021-11-29 10:37:01 -03:00
|
|
|
widget_class->map = cc_network_panel_map;
|
|
|
|
|
2017-07-12 11:08:39 -03:00
|
|
|
object_class->get_property = cc_network_panel_get_property;
|
|
|
|
object_class->set_property = cc_network_panel_set_property;
|
|
|
|
object_class->dispose = cc_network_panel_dispose;
|
|
|
|
object_class->finalize = cc_network_panel_finalize;
|
|
|
|
|
|
|
|
g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
|
|
|
|
|
2018-07-22 12:46:15 -03:00
|
|
|
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/cc-network-panel.ui");
|
2017-07-12 11:08:39 -03:00
|
|
|
|
2019-10-23 11:15:00 +13:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_bluetooth);
|
network: Add connections and devices to different stack
The current Network panel is composed of a single stack and
a treeview to select the currently visible stack page. Each
stack page represents a connection or device.
The new Network panel, however, has none of the concept of
selectable pages. In the new layout, all connections and
devices appear all at once in a more compact and simpler
fashion.
This commit, then, starts moving towards a unified, pageless
panel by adding all the connections and devices to different
stacks. These different stacks are transient to the network
object, and are added at appropriate boxes, giving the panel
a unified layout.
This has some serious implications in the design of the
current code. Most of the code removals were related to the
treeview and different pages handling. No more tree model
madness is present, and the devices are now stored in a
plain simple GPtrArray.
After this patch, NetObject:add_to_stack isn't a good code
design choice anymore. This will be addressed in a future
patch.
https://bugzilla.gnome.org/show_bug.cgi?id=785581
2017-07-15 21:24:07 -03:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_vpn);
|
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_wired);
|
2019-10-23 11:15:00 +13:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, container_bluetooth);
|
2017-07-21 14:39:27 -03:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, empty_listbox);
|
2022-11-04 17:40:24 +05:30
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, proxy_row);
|
2022-01-27 04:08:58 -08:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, vpn_stack);
|
2023-11-22 17:35:53 -03:00
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, toolbar_view);
|
2017-07-21 11:52:57 -03:00
|
|
|
|
|
|
|
gtk_widget_class_bind_template_callback (widget_class, create_connection_cb);
|
2022-11-04 17:40:24 +05:30
|
|
|
|
|
|
|
g_type_ensure (CC_TYPE_LIST_ROW);
|
|
|
|
g_type_ensure (CC_TYPE_NET_PROXY_PAGE);
|
2017-07-12 11:08:39 -03:00
|
|
|
}
|
|
|
|
|
2010-12-14 10:23:26 +00:00
|
|
|
static void
|
2019-10-18 11:47:17 +13:00
|
|
|
cc_network_panel_init (CcNetworkPanel *self)
|
2010-12-14 10:23:26 +00:00
|
|
|
{
|
2019-09-12 11:53:42 +12:00
|
|
|
g_autoptr(GDBusConnection) system_bus = NULL;
|
2021-11-29 10:37:01 -03:00
|
|
|
g_autoptr(GError) error = NULL;
|
2016-04-29 16:05:54 +02:00
|
|
|
const GPtrArray *connections;
|
|
|
|
guint i;
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2013-01-04 15:34:11 +01:00
|
|
|
g_resources_register (cc_network_get_resource ());
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
gtk_widget_init_template (GTK_WIDGET (self));
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2019-10-24 14:30:28 +13:00
|
|
|
self->bluetooth_devices = g_ptr_array_new ();
|
|
|
|
self->ethernet_devices = g_ptr_array_new ();
|
|
|
|
self->mobile_devices = g_ptr_array_new ();
|
2019-10-24 14:23:55 +13:00
|
|
|
self->vpns = g_ptr_array_new ();
|
2019-10-24 12:25:34 +13:00
|
|
|
self->nm_device_to_device = g_hash_table_new (g_direct_hash, g_direct_equal);
|
2011-01-24 15:46:58 -05:00
|
|
|
|
2018-03-27 18:00:43 -03:00
|
|
|
/* Create and store a NMClient instance if it doesn't exist yet */
|
|
|
|
if (!cc_object_storage_has_object (CC_OBJECT_NMCLIENT)) {
|
2019-09-12 11:53:42 +12:00
|
|
|
g_autoptr(NMClient) client = nm_client_new (NULL, NULL);
|
2018-03-27 18:00:43 -03:00
|
|
|
cc_object_storage_add_object (CC_OBJECT_NMCLIENT, client);
|
|
|
|
}
|
|
|
|
|
2011-02-21 10:05:22 +00:00
|
|
|
/* use NetworkManager client */
|
2019-10-18 11:47:17 +13:00
|
|
|
self->client = cc_object_storage_get_object (CC_OBJECT_NMCLIENT);
|
2018-03-27 18:00:43 -03:00
|
|
|
|
2019-10-18 11:47:17 +13:00
|
|
|
g_signal_connect_object (self->client, "notify::nm-running" ,
|
|
|
|
G_CALLBACK (manager_running), self, G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect_object (self->client, "notify::active-connections",
|
|
|
|
G_CALLBACK (active_connections_changed), self, G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect_object (self->client, "device-added",
|
|
|
|
G_CALLBACK (device_added_cb), self, G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect_object (self->client, "device-removed",
|
|
|
|
G_CALLBACK (device_removed_cb), self, G_CONNECT_SWAPPED);
|
2011-02-21 10:05:22 +00:00
|
|
|
|
2013-02-04 15:41:37 +01:00
|
|
|
/* Setup ModemManager client */
|
|
|
|
system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
|
|
|
|
if (system_bus == NULL) {
|
|
|
|
g_warning ("Error connecting to system D-Bus: %s",
|
|
|
|
error->message);
|
|
|
|
} else {
|
2019-10-18 11:47:17 +13:00
|
|
|
self->modem_manager = mm_manager_new_sync (system_bus,
|
2017-07-12 10:16:12 -03:00
|
|
|
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
|
|
|
|
NULL,
|
|
|
|
&error);
|
2019-10-18 11:47:17 +13:00
|
|
|
if (self->modem_manager == NULL)
|
2013-02-04 15:41:37 +01:00
|
|
|
g_warning ("Error connecting to ModemManager: %s",
|
|
|
|
error->message);
|
|
|
|
}
|
|
|
|
|
2011-02-21 10:05:22 +00:00
|
|
|
/* add remote settings such as VPN settings as virtual devices */
|
2019-10-18 11:47:17 +13:00
|
|
|
g_signal_connect_object (self->client, NM_CLIENT_CONNECTION_ADDED,
|
2019-10-24 13:21:17 +13:00
|
|
|
G_CALLBACK (add_connection), self, G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect_object (self->client, NM_CLIENT_CONNECTION_REMOVED,
|
|
|
|
G_CALLBACK (client_connection_removed_cb), self, G_CONNECT_SWAPPED);
|
2011-02-21 10:05:22 +00:00
|
|
|
|
2016-04-29 16:05:54 +02:00
|
|
|
/* Cold-plug existing connections */
|
2019-10-18 11:47:17 +13:00
|
|
|
connections = nm_client_get_connections (self->client);
|
2017-11-01 16:45:46 +01:00
|
|
|
if (connections) {
|
|
|
|
for (i = 0; i < connections->len; i++)
|
2019-10-18 11:47:17 +13:00
|
|
|
add_connection (self, connections->pdata[i]);
|
2017-11-01 16:45:46 +01:00
|
|
|
}
|
2016-04-29 16:05:54 +02:00
|
|
|
|
|
|
|
g_debug ("Calling handle_argv() after cold-plugging connections");
|
2019-10-18 11:47:17 +13:00
|
|
|
handle_argv (self);
|
2010-12-14 10:23:26 +00:00
|
|
|
}
|