[gnome-control-center] network: Convert NetVpn to GtkTemplate

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 93a269f8dffe7de19d4f59bf3b005be318a5bca8
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Oct 24 14:23:55 2019 +1300

    network: Convert NetVpn to GtkTemplate

 panels/network/cc-network-panel.c | 17 ++++++---------
 panels/network/net-vpn.c          | 45 +++++++++++----------------------------
 panels/network/net-vpn.h          |  7 ++----
 panels/network/network-vpn.ui     |  5 ++---
 4 files changed, 22 insertions(+), 52 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 22332c037..aad79df3c 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -588,13 +588,9 @@ panel_add_vpn_device (CcNetworkPanel *self, NMConnection *connection)
                         return;
         }
 
-        /* add as a VPN object */
-        net_vpn = net_vpn_new (connection,
-                               self->client);
-
-
-        /* add as a panel */
-        add_object (self, NET_OBJECT (net_vpn), GTK_CONTAINER (self->box_vpn));
+        net_vpn = net_vpn_new (connection, self->client);
+        gtk_widget_show (GTK_WIDGET (net_vpn));
+        gtk_container_add (GTK_CONTAINER (self->box_vpn), GTK_WIDGET (net_vpn));
 
         /* store in the devices array */
         g_ptr_array_add (self->vpns, net_vpn);
@@ -635,9 +631,8 @@ client_connection_removed_cb (CcNetworkPanel *self, NMConnection *connection)
         for (i = 0; i < self->vpns->len; i++) {
                 NetVpn *vpn = g_ptr_array_index (self->vpns, i);
                 if (net_vpn_get_connection (vpn) == connection) {
-                        GtkWidget *widget = g_hash_table_lookup (self->device_to_widget, vpn);
-                        if (widget != NULL)
-                                gtk_widget_destroy (widget);
+                        g_ptr_array_remove (self->vpns, vpn);
+                        gtk_widget_destroy (GTK_WIDGET (vpn));
                         return;
                 }
         }
@@ -749,7 +744,7 @@ cc_network_panel_init (CcNetworkPanel *self)
         self->bluetooth_devices = g_ptr_array_new_with_free_func (g_object_unref);
         self->ethernet_devices = g_ptr_array_new_with_free_func (g_object_unref);
         self->mobile_devices = g_ptr_array_new_with_free_func (g_object_unref);
-        self->vpns = g_ptr_array_new_with_free_func (g_object_unref);
+        self->vpns = g_ptr_array_new ();
         self->device_to_widget = g_hash_table_new (g_direct_hash, g_direct_equal);
         self->nm_device_to_device = g_hash_table_new (g_direct_hash, g_direct_equal);
 
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index 0b3e420af..74e031e53 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -31,12 +31,10 @@
 
 #include "connection-editor/net-connection-editor.h"
 
-
 struct _NetVpn
 {
-        NetObject               parent;
+        GtkBox                   parent;
 
-        GtkBuilder              *builder;
         GtkBox                  *box;
         GtkLabel                *device_label;
         GtkSwitch               *device_off_switch;
@@ -49,16 +47,7 @@ struct _NetVpn
         gboolean                 updating_device;
 };
 
-G_DEFINE_TYPE (NetVpn, net_vpn, NET_TYPE_OBJECT)
-
-static GtkWidget *
-vpn_proxy_get_widget (NetObject    *object,
-                      GtkSizeGroup *heading_size_group)
-{
-        NetVpn *self = NET_VPN (object);
-
-        return GTK_WIDGET (self->box);
-}
+G_DEFINE_TYPE (NetVpn, net_vpn, GTK_TYPE_BOX)
 
 static void
 nm_device_refresh_vpn_ui (NetVpn *self)
@@ -192,7 +181,6 @@ net_vpn_finalize (GObject *object)
         g_clear_object (&self->active_connection);
         g_clear_object (&self->client);
         g_clear_object (&self->connection);
-        g_clear_object (&self->builder);
 
         G_OBJECT_CLASS (net_vpn_parent_class)->finalize (object);
 }
@@ -201,31 +189,22 @@ static void
 net_vpn_class_init (NetVpnClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
-        NetObjectClass *parent_class = NET_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
         object_class->finalize = net_vpn_finalize;
-        parent_class->get_widget = vpn_proxy_get_widget;
+
+        gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/control-center/network/network-vpn.ui");
+
+        gtk_widget_class_bind_template_child (widget_class, NetVpn, device_label);
+        gtk_widget_class_bind_template_child (widget_class, NetVpn, device_off_switch);
+        gtk_widget_class_bind_template_child (widget_class, NetVpn, options_button);
+        gtk_widget_class_bind_template_child (widget_class, NetVpn, separator);
 }
 
 static void
 net_vpn_init (NetVpn *self)
 {
-        g_autoptr(GError) error = NULL;
-
-        self->builder = gtk_builder_new ();
-        gtk_builder_add_from_resource (self->builder,
-                                       "/org/gnome/control-center/network/network-vpn.ui",
-                                       &error);
-        if (error != NULL) {
-                g_warning ("Could not load interface file: %s", error->message);
-                return;
-        }
-
-        self->box = GTK_BOX (gtk_builder_get_object (self->builder, "box"));
-        self->device_label = GTK_LABEL (gtk_builder_get_object (self->builder, "device_label"));
-        self->device_off_switch = GTK_SWITCH (gtk_builder_get_object (self->builder, "device_off_switch"));
-        self->options_button = GTK_BUTTON (gtk_builder_get_object (self->builder, "options_button"));
-        self->separator = GTK_SEPARATOR (gtk_builder_get_object (self->builder, "separator"));
+        gtk_widget_init_template (GTK_WIDGET (self));
 
         g_signal_connect_swapped (self->device_off_switch, "notify::active",
                                   G_CALLBACK (device_off_toggled), self);
@@ -240,7 +219,7 @@ net_vpn_new (NMConnection *connection,
 {
         NetVpn *self;
 
-        self = g_object_new (NET_TYPE_VPN, NULL);
+        self = g_object_new (net_vpn_get_type (), NULL);
         self->client = g_object_ref (client);
         self->connection = g_object_ref (connection);
 
diff --git a/panels/network/net-vpn.h b/panels/network/net-vpn.h
index 5ebdbe48d..5a7d8ae62 100644
--- a/panels/network/net-vpn.h
+++ b/panels/network/net-vpn.h
@@ -21,15 +21,12 @@
 
 #pragma once
 
-#include <glib-object.h>
+#include <gtk/gtk.h>
 #include <NetworkManager.h>
 
-#include "net-object.h"
-
 G_BEGIN_DECLS
 
-#define NET_TYPE_VPN (net_vpn_get_type ())
-G_DECLARE_FINAL_TYPE (NetVpn, net_vpn, NET, VPN, NetObject)
+G_DECLARE_FINAL_TYPE (NetVpn, net_vpn, NET, VPN, GtkBox)
 
 NetVpn       *net_vpn_new                (NMConnection *connection,
                                           NMClient     *client);
diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui
index 35f85c78f..edc8fd728 100644
--- a/panels/network/network-vpn.ui
+++ b/panels/network/network-vpn.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkBox" id="box">
-    <property name="visible">True</property>
+  <template class="NetVpn" parent="GtkBox">
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="orientation">vertical</property>
@@ -87,5 +86,5 @@
         </child>
       </object>
     </child>
-  </object>
+  </template>
 </interface>