[gnome-control-center] printers: Make .ui filename match the .c filename
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] printers: Make .ui filename match the .c filename
- Date: Tue, 10 Sep 2019 02:40:13 +0000 (UTC)
commit 6d23ac08922daf788edaec9549d095122b933860
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Nov 23 11:33:06 2018 +1300
printers: Make .ui filename match the .c filename
panels/printers/meson.build | 2 +-
panels/printers/pp-options-dialog.c | 2 +-
panels/printers/{options-dialog.ui => pp-options-dialog.ui} | 0
panels/printers/printers.gresource.xml | 2 +-
po/POTFILES.in | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/panels/printers/meson.build b/panels/printers/meson.build
index b028b6d46..a1746a8e6 100644
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@@ -42,9 +42,9 @@ resource_data = files(
'authentication-dialog.ui',
'jobs-dialog.ui',
'new-printer-dialog.ui',
- 'options-dialog.ui',
'ppd-selection-dialog.ui',
'pp-details-dialog.ui',
+ 'pp-options-dialog.ui',
'printer-entry.ui',
'printers.ui'
)
diff --git a/panels/printers/pp-options-dialog.c b/panels/printers/pp-options-dialog.c
index d95e84371..6b91fefbb 100644
--- a/panels/printers/pp-options-dialog.c
+++ b/panels/printers/pp-options-dialog.c
@@ -957,7 +957,7 @@ pp_options_dialog_new (GtkWindow *parent,
self->parent = GTK_WIDGET (parent);
builder_result = gtk_builder_add_objects_from_resource (self->builder,
-
"/org/gnome/control-center/printers/options-dialog.ui",
+
"/org/gnome/control-center/printers/pp-options-dialog.ui",
objects, &error);
if (builder_result == 0)
diff --git a/panels/printers/options-dialog.ui b/panels/printers/pp-options-dialog.ui
similarity index 100%
rename from panels/printers/options-dialog.ui
rename to panels/printers/pp-options-dialog.ui
diff --git a/panels/printers/printers.gresource.xml b/panels/printers/printers.gresource.xml
index 98b6a8e4c..385ff710e 100644
--- a/panels/printers/printers.gresource.xml
+++ b/panels/printers/printers.gresource.xml
@@ -4,7 +4,7 @@
<file preprocess="xml-stripblanks">authentication-dialog.ui</file>
<file preprocess="xml-stripblanks">jobs-dialog.ui</file>
<file preprocess="xml-stripblanks">new-printer-dialog.ui</file>
- <file preprocess="xml-stripblanks">options-dialog.ui</file>
+ <file preprocess="xml-stripblanks">pp-options-dialog.ui</file>
<file preprocess="xml-stripblanks">ppd-selection-dialog.ui</file>
<file preprocess="xml-stripblanks">pp-details-dialog.ui</file>
<file preprocess="xml-stripblanks">printer-entry.ui</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3ce06d9a3..92a68619d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -142,7 +142,6 @@ panels/printers/cc-printers-panel.c
panels/printers/gnome-printers-panel.desktop.in.in
panels/printers/jobs-dialog.ui
panels/printers/new-printer-dialog.ui
-panels/printers/options-dialog.ui
panels/printers/pp-details-dialog.c
panels/printers/pp-details-dialog.ui
panels/printers/ppd-selection-dialog.ui
@@ -151,6 +150,7 @@ panels/printers/pp-ipp-option-widget.c
panels/printers/pp-jobs-dialog.c
panels/printers/pp-new-printer-dialog.c
panels/printers/pp-options-dialog.c
+panels/printers/pp-options-dialog.ui
panels/printers/pp-ppd-option-widget.c
panels/printers/pp-ppd-selection-dialog.c
panels/printers/pp-printer-entry.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]