From 59cc518c3ef3de54db2edd2f5cc42a2fcc33a971 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Thu, 8 Nov 2018 14:33:22 +1300
Subject: [PATCH] universal-access: Make .ui filename match the .c filename

---
 panels/universal-access/cc-ua-panel.c                  | 2 +-
 panels/universal-access/{uap.ui => cc-ua-panel.ui}     | 0
 panels/universal-access/meson.build                    | 2 +-
 panels/universal-access/universal-access.gresource.xml | 2 +-
 po/POTFILES.in                                         | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename panels/universal-access/{uap.ui => cc-ua-panel.ui} (100%)

diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 11ac3fb9b..4560a6034 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -240,7 +240,7 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
 
   object_class->dispose = cc_ua_panel_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/uap.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/cc-ua-panel.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_scale);
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/cc-ua-panel.ui
similarity index 100%
rename from panels/universal-access/uap.ui
rename to panels/universal-access/cc-ua-panel.ui
diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build
index 119143654..79615a55b 100644
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -23,12 +23,12 @@ sources = files(
 )
 
 resource_data = files(
+  'cc-ua-panel.ui',
   'left_ptr_24px.png',
   'left_ptr_32px.png',
   'left_ptr_48px.png',
   'left_ptr_64px.png',
   'left_ptr_96px.png',
-  'uap.ui',
   'zoom-options.ui'
 )
 
diff --git a/panels/universal-access/universal-access.gresource.xml b/panels/universal-access/universal-access.gresource.xml
index d7f2e337a..dde0edc17 100644
--- a/panels/universal-access/universal-access.gresource.xml
+++ b/panels/universal-access/universal-access.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/universal-access">
-    <file preprocess="xml-stripblanks">uap.ui</file>
+    <file preprocess="xml-stripblanks">cc-ua-panel.ui</file>
     <file preprocess="xml-stripblanks">zoom-options.ui</file>
     <file>left_ptr_24px.png</file>
     <file>left_ptr_32px.png</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6516d8ab2..98bb47a7b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -189,8 +189,8 @@ panels/thunderbolt/cc-bolt-panel.c
 panels/thunderbolt/cc-bolt-panel.ui
 panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
 panels/universal-access/cc-ua-panel.c
+panels/universal-access/cc-ua-panel.ui
 panels/universal-access/gnome-universal-access-panel.desktop.in.in
-panels/universal-access/uap.ui
 panels/universal-access/zoom-options.c
 panels/universal-access/zoom-options.ui
 panels/user-accounts/cc-add-user-dialog.c