From a30e0fad1f9cdc953e21af350cd9134c6262bbf9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Jun 2023 23:47:34 -0400
Subject: [PATCH] Move resources too

---
 gtk/gen-gtk-gresources-xml.py                | 3 +++
 gtk/print/gtkpagesetupunixdialog.c           | 2 +-
 gtk/print/gtkprintunixdialog.c               | 2 +-
 gtk/{ => print}/ui/gtkpagesetupunixdialog.ui | 0
 gtk/{ => print}/ui/gtkprintunixdialog.ui     | 0
 po/POTFILES.in                               | 4 ++--
 6 files changed, 7 insertions(+), 4 deletions(-)
 rename gtk/{ => print}/ui/gtkpagesetupunixdialog.ui (100%)
 rename gtk/{ => print}/ui/gtkprintunixdialog.ui (100%)

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index 66d2246343..6179fbf8e1 100644
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -68,6 +68,9 @@ for f in get_files('theme/Default/assets-hc', '.svg'):
 for f in get_files('ui', '.ui'):
   xml += '    <file>ui/{0}</file>\n'.format(f)
 
+for f in get_files('print/ui', '.ui'):
+  xml += '    <file>print/ui/{0}</file>\n'.format(f)
+
 xml += '\n'
 
 xml += '''
diff --git a/gtk/print/gtkpagesetupunixdialog.c b/gtk/print/gtkpagesetupunixdialog.c
index ab4ee7f2a9..5879427d3a 100644
--- a/gtk/print/gtkpagesetupunixdialog.c
+++ b/gtk/print/gtkpagesetupunixdialog.c
@@ -146,7 +146,7 @@ gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class)
   /* Bind class to template
    */
   gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/libgtk/ui/gtkpagesetupunixdialog.ui");
+                                               "/org/gtk/libgtk/print/ui/gtkpagesetupunixdialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtkPageSetupUnixDialog, printer_combo);
   gtk_widget_class_bind_template_child (widget_class, GtkPageSetupUnixDialog, paper_size_combo);
diff --git a/gtk/print/gtkprintunixdialog.c b/gtk/print/gtkprintunixdialog.c
index 28b9eb4811..5c1c587bb5 100644
--- a/gtk/print/gtkprintunixdialog.c
+++ b/gtk/print/gtkprintunixdialog.c
@@ -460,7 +460,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
   /* Bind class to template
    */
   gtk_widget_class_set_template_from_resource (widget_class,
-					       "/org/gtk/libgtk/ui/gtkprintunixdialog.ui");
+					       "/org/gtk/libgtk/print/ui/gtkprintunixdialog.ui");
 
   /* GtkTreeView / GtkTreeModel */
   gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list);
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/print/ui/gtkpagesetupunixdialog.ui
similarity index 100%
rename from gtk/ui/gtkpagesetupunixdialog.ui
rename to gtk/print/ui/gtkpagesetupunixdialog.ui
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/print/ui/gtkprintunixdialog.ui
similarity index 100%
rename from gtk/ui/gtkprintunixdialog.ui
rename to gtk/print/ui/gtkprintunixdialog.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4654345c53..a88114f290 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -401,10 +401,10 @@ gtk/ui/gtkfontchooserwidget.ui
 gtk/ui/gtklockbutton.ui
 gtk/ui/gtkmediacontrols.ui
 gtk/ui/gtkmessagedialog.ui
-gtk/ui/gtkpagesetupunixdialog.ui
+gtk/print/ui/gtkpagesetupunixdialog.ui
 gtk/ui/gtkplacesviewrow.ui
 gtk/ui/gtkplacesview.ui
-gtk/ui/gtkprintunixdialog.ui
+gtk/print/ui/gtkprintunixdialog.ui
 gtk/ui/gtkscalebutton.ui
 gtk/ui/gtksidebarrow.ui
 gtk/ui/gtkstatusbar.ui
-- 
2.30.2