From 6fc8e57bdd21f9b1153cb8fae032471551cd98dc Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Thu, 15 Nov 2018 09:15:46 +1300
Subject: [PATCH] keyboard: Make .ui filename match the .c filename

---
 panels/keyboard/cc-keyboard-shortcut-editor.c                 | 2 +-
 .../{shortcut-editor.ui => cc-keyboard-shortcut-editor.ui}    | 0
 panels/keyboard/keyboard.gresource.xml                        | 4 ++--
 panels/keyboard/meson.build                                   | 4 ++--
 po/POTFILES.in                                                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename panels/keyboard/{shortcut-editor.ui => cc-keyboard-shortcut-editor.ui} (100%)

diff --git a/panels/keyboard/cc-keyboard-shortcut-editor.c b/panels/keyboard/cc-keyboard-shortcut-editor.c
index 499260d75..b5090d4d6 100644
--- a/panels/keyboard/cc-keyboard-shortcut-editor.c
+++ b/panels/keyboard/cc-keyboard-shortcut-editor.c
@@ -884,7 +884,7 @@ cc_keyboard_shortcut_editor_class_init (CcKeyboardShortcutEditorClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/shortcut-editor.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/cc-keyboard-shortcut-editor.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, add_button);
   gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, cancel_button);
diff --git a/panels/keyboard/shortcut-editor.ui b/panels/keyboard/cc-keyboard-shortcut-editor.ui
similarity index 100%
rename from panels/keyboard/shortcut-editor.ui
rename to panels/keyboard/cc-keyboard-shortcut-editor.ui
diff --git a/panels/keyboard/keyboard.gresource.xml b/panels/keyboard/keyboard.gresource.xml
index 862f9f754..81566ef6d 100644
--- a/panels/keyboard/keyboard.gresource.xml
+++ b/panels/keyboard/keyboard.gresource.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/keyboard">
-    <file preprocess="xml-stripblanks">cc-keyboard-panel.ui</file>
     <file preprocess="xml-stripblanks">enter-keyboard-shortcut.svg</file>
-    <file preprocess="xml-stripblanks">shortcut-editor.ui</file>
+    <file preprocess="xml-stripblanks">cc-keyboard-panel.ui</file>
+    <file preprocess="xml-stripblanks">cc-keyboard-shortcut-editor.ui</file>
   </gresource>
 </gresources>
diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build
index b60dcc295..f90a52c84 100644
--- a/panels/keyboard/meson.build
+++ b/panels/keyboard/meson.build
@@ -66,9 +66,9 @@ sources = files(
 )
 
 resource_data = files(
-  'cc-keyboard-panel.ui',
   'enter-keyboard-shortcut.svg',
-  'shortcut-editor.ui'
+  'cc-keyboard-panel.ui',
+  'cc-keyboard-shortcut-editor.ui',
 )
 
 sources += gnome.compile_resources(
diff --git a/po/POTFILES.in b/po/POTFILES.in
index faee5b21b..806afb4a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,9 +58,9 @@ panels/keyboard/cc-keyboard-option.c
 panels/keyboard/cc-keyboard-panel.c
 panels/keyboard/cc-keyboard-panel.ui
 panels/keyboard/cc-keyboard-shortcut-editor.c
+panels/keyboard/cc-keyboard-shortcut-editor.ui
 panels/keyboard/gnome-keyboard-panel.desktop.in.in
 panels/keyboard/keyboard-shortcuts.c
-panels/keyboard/shortcut-editor.ui
 panels/mouse/cc-mouse-panel.c
 panels/mouse/gnome-mouse-panel.desktop.in.in
 panels/mouse/gnome-mouse-properties.c