From f9b9f105ddcbeb5d57edf8576142cdceea56390c Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sun, 22 Jul 2018 12:46:15 -0300
Subject: [PATCH] network: Rename UI files to match C files

This commit renames {network|wifi}.ui to cc-{network|wifi}-pane.ui,
in order to match the corresponding C files. This introduces no
functional changes.
---
 panels/network/cc-network-panel.c                  | 2 +-
 panels/network/{network.ui => cc-network-panel.ui} | 0
 panels/network/cc-wifi-panel.c                     | 2 +-
 panels/network/{wifi.ui => cc-wifi-panel.ui}       | 0
 panels/network/meson.build                         | 6 +++---
 panels/network/network.gresource.xml               | 4 ++--
 po/POTFILES.in                                     | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename panels/network/{network.ui => cc-network-panel.ui} (100%)
 rename panels/network/{wifi.ui => cc-wifi-panel.ui} (100%)

diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 4afb30895..2651edccd 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -847,7 +847,7 @@ cc_network_panel_class_init (CcNetworkPanelClass *klass)
 
         g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
 
-        gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/network.ui");
+        gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/cc-network-panel.ui");
 
         gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_proxy);
         gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_simple);
diff --git a/panels/network/network.ui b/panels/network/cc-network-panel.ui
similarity index 100%
rename from panels/network/network.ui
rename to panels/network/cc-network-panel.ui
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index bd7a3bea1..fb77d2e1a 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -656,7 +656,7 @@ cc_wifi_panel_class_init (CcWifiPanelClass *klass)
   object_class->get_property = cc_wifi_panel_get_property;
   object_class->set_property = cc_wifi_panel_set_property;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/wifi.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/cc-wifi-panel.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, center_stack);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, header_stack);
diff --git a/panels/network/wifi.ui b/panels/network/cc-wifi-panel.ui
similarity index 100%
rename from panels/network/wifi.ui
rename to panels/network/cc-wifi-panel.ui
diff --git a/panels/network/meson.build b/panels/network/meson.build
index 2ec4fbf71..049b4b0ea 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -49,14 +49,14 @@ sources = files(
 )
 
 resource_data = files(
+  'cc-network-panel.ui',
+  'cc-wifi-panel.ui',
   'network-ethernet.ui',
   'network-mobile.ui',
   'network-proxy.ui',
   'network-simple.ui',
-  'network.ui',
   'network-vpn.ui',
   'network-wifi.ui',
-  'wifi.ui'
 )
 
 sources += gnome.compile_resources(
@@ -77,4 +77,4 @@ network_panel_lib = static_library(
   c_args: cflags,
   link_with: libconnection_editor
 )
-panels_libs += network_panel_lib
+panels_libs += network_panel_lib
\ No newline at end of file
diff --git a/panels/network/network.gresource.xml b/panels/network/network.gresource.xml
index 3532b7cae..348c5dc66 100644
--- a/panels/network/network.gresource.xml
+++ b/panels/network/network.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/control-center/network">
     <!-- Network panel -->
-    <file preprocess="xml-stripblanks">network.ui</file>
+    <file preprocess="xml-stripblanks">cc-network-panel.ui</file>
     <file preprocess="xml-stripblanks">network-proxy.ui</file>
     <file preprocess="xml-stripblanks">network-vpn.ui</file>
     <file preprocess="xml-stripblanks">network-wifi.ui</file>
@@ -11,6 +11,6 @@
     <file preprocess="xml-stripblanks">network-ethernet.ui</file>
 
     <!-- Wi-Fi panel -->
-    <file preprocess="xml-stripblanks">wifi.ui</file>
+    <file preprocess="xml-stripblanks">cc-wifi-panel.ui</file>
   </gresource>
 </gresources>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0d3bd9ae7..43c542b69 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,7 +62,9 @@ panels/mouse/gnome-mouse-properties.ui
 panels/mouse/gnome-mouse-test.c
 panels/mouse/gnome-mouse-test.ui
 panels/network/cc-network-panel.c
+panels/network/cc-network-panel.ui
 panels/network/cc-wifi-panel.c
+panels/network/cc-wifi-panel.ui
 panels/network/connection-editor/8021x-security-page.ui
 panels/network/connection-editor/ce-page-8021x-security.c
 panels/network/connection-editor/ce-page.c
@@ -94,10 +96,8 @@ panels/network/network-ethernet.ui
 panels/network/network-mobile.ui
 panels/network/network-proxy.ui
 panels/network/network-simple.ui
-panels/network/network.ui
 panels/network/network-vpn.ui
 panels/network/network-wifi.ui
-panels/network/wifi.ui
 panels/network/panel-common.c
 panels/network/wireless-security/eap-method.c
 panels/network/wireless-security/eap-method-fast.c