[gnome-control-center] color: Make .ui filename match the .c filename



commit 871f10bcf4d6183de058ac10475ffd658f7ac85b
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Nov 15 09:09:58 2018 +1300

    color: Make .ui filename match the .c filename

 panels/color/cc-color-calibrate.c                          | 2 +-
 panels/color/{color-calibrate.ui => cc-color-calibrate.ui} | 0
 panels/color/color.gresource.xml                           | 4 +---
 panels/color/meson.build                                   | 2 +-
 po/POTFILES.in                                             | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/panels/color/cc-color-calibrate.c b/panels/color/cc-color-calibrate.c
index 4b96df3ea..5ebd47248 100644
--- a/panels/color/cc-color-calibrate.c
+++ b/panels/color/cc-color-calibrate.c
@@ -1026,7 +1026,7 @@ cc_color_calibrate_init (CcColorCalibrate *calibrate)
   /* load UI */
   calibrate->builder = gtk_builder_new ();
   retval = gtk_builder_add_from_resource (calibrate->builder,
-                                          "/org/gnome/control-center/color/color-calibrate.ui",
+                                          "/org/gnome/control-center/color/cc-color-calibrate.ui",
                                           &error);
   if (retval == 0)
     g_warning ("Could not load interface: %s", error->message);
diff --git a/panels/color/color-calibrate.ui b/panels/color/cc-color-calibrate.ui
similarity index 100%
rename from panels/color/color-calibrate.ui
rename to panels/color/cc-color-calibrate.ui
diff --git a/panels/color/color.gresource.xml b/panels/color/color.gresource.xml
index 9f1f84671..04cf9b343 100644
--- a/panels/color/color.gresource.xml
+++ b/panels/color/color.gresource.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/color">
+    <file preprocess="xml-stripblanks">cc-color-calibrate.ui</file>
     <file preprocess="xml-stripblanks">cc-color-panel.ui</file>
   </gresource>
-  <gresource prefix="/org/gnome/control-center/color">
-    <file preprocess="xml-stripblanks">color-calibrate.ui</file>
-  </gresource>
 </gresources>
diff --git a/panels/color/meson.build b/panels/color/meson.build
index d688d7a06..d21c54a6a 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -27,8 +27,8 @@ sources = files(
 )
 
 resource_data = files(
+  'cc-color-calibrate.ui',
   'cc-color-panel.ui',
-  'color-calibrate.ui',
 )
 
 sources += gnome.compile_resources(
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 51e8d05eb..a868b8b08 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,12 +15,12 @@ panels/bluetooth/cc-bluetooth-panel.c
 panels/bluetooth/cc-bluetooth-panel.ui
 panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
 panels/color/cc-color-calibrate.c
+panels/color/cc-color-calibrate.ui
 panels/color/cc-color-common.c
 panels/color/cc-color-device.c
 panels/color/cc-color-panel.c
 panels/color/cc-color-panel.ui
 panels/color/cc-color-profile.c
-panels/color/color-calibrate.ui
 panels/color/gnome-color-panel.desktop.in.in
 panels/common/cc-common-language.c
 panels/common/cc-language-chooser.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]