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



commit e5ee278393763e10bff7195349468a7e92404e7b
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Nov 13 13:45:43 2018 +1300

    bluetooth: Make .ui filename match the .c filename

 panels/bluetooth/bluetooth.gresource.xml                 | 2 +-
 panels/bluetooth/cc-bluetooth-panel.c                    | 2 +-
 panels/bluetooth/{bluetooth.ui => cc-bluetooth-panel.ui} | 0
 panels/bluetooth/meson.build                             | 2 +-
 po/POTFILES.in                                           | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/panels/bluetooth/bluetooth.gresource.xml b/panels/bluetooth/bluetooth.gresource.xml
index 95f0a0741..75b960aa7 100644
--- a/panels/bluetooth/bluetooth.gresource.xml
+++ b/panels/bluetooth/bluetooth.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/bluetooth">
-    <file preprocess="xml-stripblanks">bluetooth.ui</file>
+    <file preprocess="xml-stripblanks">cc-bluetooth-panel.ui</file>
   </gresource>
 </gresources>
diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c
index 9f4ca40ae..d23172ab0 100644
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -306,7 +306,7 @@ cc_bluetooth_panel_init (CcBluetoothPanel *self)
        self->builder = gtk_builder_new ();
        gtk_builder_set_translation_domain (self->builder, GETTEXT_PACKAGE);
        gtk_builder_add_from_resource (self->builder,
-                                       "/org/gnome/control-center/bluetooth/bluetooth.ui",
+                                       "/org/gnome/control-center/bluetooth/cc-bluetooth-panel.ui",
                                        &error);
        if (error != NULL) {
                g_warning ("Could not load ui: %s", error->message);
diff --git a/panels/bluetooth/bluetooth.ui b/panels/bluetooth/cc-bluetooth-panel.ui
similarity index 100%
rename from panels/bluetooth/bluetooth.ui
rename to panels/bluetooth/cc-bluetooth-panel.ui
diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build
index 76b05a1d7..fad3f79d5 100644
--- a/panels/bluetooth/meson.build
+++ b/panels/bluetooth/meson.build
@@ -19,7 +19,7 @@ i18n.merge_file(
 
 sources = files('cc-bluetooth-panel.c')
 
-resource_data = files('bluetooth.ui')
+resource_data = files('cc-bluetooth-panel.ui')
 
 sources += gnome.compile_resources(
   'cc-' + cappletname + '-resources',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 948685c23..a49a7a0a7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,8 +6,8 @@ panels/background/cc-background-chooser-dialog.c
 panels/background/cc-background-item.c
 panels/background/cc-background-panel.c
 panels/background/gnome-background-panel.desktop.in.in
-panels/bluetooth/bluetooth.ui
 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-common.c


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