From 8f12ef3c09cb2d643fbb6008fe58be5d55817726 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 24 Jun 2019 17:09:10 -0700
Subject: [PATCH] build: move .ui files out of ui subdirectory

This has mostly just been annoying, so move them.
---
 src/libsysprof-ui/libsysprof-ui.gresource.xml | 34 ++++++++++---------
 .../{ui => }/sysprof-aid-icon.ui              |  0
 .../{ui => }/sysprof-callgraph-view.ui        |  0
 .../{ui => }/sysprof-capture-view.ui          |  0
 .../{ui => }/sysprof-details-view.ui          |  0
 src/libsysprof-ui/{ui => }/sysprof-display.ui |  0
 .../{ui => }/sysprof-empty-state-view.ui      |  0
 .../{ui => }/sysprof-environ-editor-row.ui    |  0
 .../{ui => }/sysprof-failed-state-view.ui     |  0
 .../{ui => }/sysprof-logs-view.ui             |  0
 .../{ui => }/sysprof-marks-view.ui            |  0
 .../{ui => }/sysprof-process-model-row.ui     |  0
 .../{ui => }/sysprof-profiler-assistant.ui    |  0
 .../{ui => }/sysprof-recording-state-view.ui  |  0
 src/libsysprof-ui/{ui => }/sysprof-tab.ui     |  0
 .../{ui => }/sysprof-time-label.ui            |  0
 .../{ui => }/sysprof-visualizer-view.ui       |  0
 17 files changed, 18 insertions(+), 16 deletions(-)
 rename src/libsysprof-ui/{ui => }/sysprof-aid-icon.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-callgraph-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-capture-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-details-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-display.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-empty-state-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-environ-editor-row.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-failed-state-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-logs-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-marks-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-process-model-row.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-profiler-assistant.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-recording-state-view.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-tab.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-time-label.ui (100%)
 rename src/libsysprof-ui/{ui => }/sysprof-visualizer-view.ui (100%)

diff --git a/src/libsysprof-ui/libsysprof-ui.gresource.xml b/src/libsysprof-ui/libsysprof-ui.gresource.xml
index b524fe77..a4bca358 100644
--- a/src/libsysprof-ui/libsysprof-ui.gresource.xml
+++ b/src/libsysprof-ui/libsysprof-ui.gresource.xml
@@ -10,22 +10,24 @@
     <file alias="icons/scalable/apps/org.gnome.Sysprof.svg">../../data/icons/scalable/apps/org.gnome.Sysprof.svg</file>
     <file alias="icons/scalable/apps/org.gnome.Sysprof-symbolic.svg">../../data/icons/symbolic/apps/org.gnome.Sysprof-symbolic.svg</file>
     <file alias="icons/symbolic/apps/org.gnome.Sysprof-symbolic.svg">../../data/icons/symbolic/apps/org.gnome.Sysprof-symbolic.svg</file>
+  </gresource>
 
-    <file preprocess="xml-stripblanks">ui/sysprof-aid-icon.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-callgraph-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-capture-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-display.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-details-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-empty-state-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-environ-editor-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-failed-state-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-logs-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-marks-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-process-model-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-profiler-assistant.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-recording-state-view.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-tab.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-time-label.ui</file>
-    <file preprocess="xml-stripblanks">ui/sysprof-visualizer-view.ui</file>
+  <gresource prefix="/org/gnome/sysprof/ui">
+    <file preprocess="xml-stripblanks">sysprof-aid-icon.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-callgraph-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-capture-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-display.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-details-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-empty-state-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-environ-editor-row.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-failed-state-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-logs-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-marks-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-process-model-row.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-profiler-assistant.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-recording-state-view.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-tab.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-time-label.ui</file>
+    <file preprocess="xml-stripblanks">sysprof-visualizer-view.ui</file>
   </gresource>
 </gresources>
diff --git a/src/libsysprof-ui/ui/sysprof-aid-icon.ui b/src/libsysprof-ui/sysprof-aid-icon.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-aid-icon.ui
rename to src/libsysprof-ui/sysprof-aid-icon.ui
diff --git a/src/libsysprof-ui/ui/sysprof-callgraph-view.ui b/src/libsysprof-ui/sysprof-callgraph-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-callgraph-view.ui
rename to src/libsysprof-ui/sysprof-callgraph-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-capture-view.ui b/src/libsysprof-ui/sysprof-capture-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-capture-view.ui
rename to src/libsysprof-ui/sysprof-capture-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-details-view.ui b/src/libsysprof-ui/sysprof-details-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-details-view.ui
rename to src/libsysprof-ui/sysprof-details-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-display.ui b/src/libsysprof-ui/sysprof-display.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-display.ui
rename to src/libsysprof-ui/sysprof-display.ui
diff --git a/src/libsysprof-ui/ui/sysprof-empty-state-view.ui b/src/libsysprof-ui/sysprof-empty-state-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-empty-state-view.ui
rename to src/libsysprof-ui/sysprof-empty-state-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-environ-editor-row.ui b/src/libsysprof-ui/sysprof-environ-editor-row.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-environ-editor-row.ui
rename to src/libsysprof-ui/sysprof-environ-editor-row.ui
diff --git a/src/libsysprof-ui/ui/sysprof-failed-state-view.ui b/src/libsysprof-ui/sysprof-failed-state-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-failed-state-view.ui
rename to src/libsysprof-ui/sysprof-failed-state-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-logs-view.ui b/src/libsysprof-ui/sysprof-logs-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-logs-view.ui
rename to src/libsysprof-ui/sysprof-logs-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-marks-view.ui b/src/libsysprof-ui/sysprof-marks-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-marks-view.ui
rename to src/libsysprof-ui/sysprof-marks-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-process-model-row.ui b/src/libsysprof-ui/sysprof-process-model-row.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-process-model-row.ui
rename to src/libsysprof-ui/sysprof-process-model-row.ui
diff --git a/src/libsysprof-ui/ui/sysprof-profiler-assistant.ui b/src/libsysprof-ui/sysprof-profiler-assistant.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-profiler-assistant.ui
rename to src/libsysprof-ui/sysprof-profiler-assistant.ui
diff --git a/src/libsysprof-ui/ui/sysprof-recording-state-view.ui b/src/libsysprof-ui/sysprof-recording-state-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-recording-state-view.ui
rename to src/libsysprof-ui/sysprof-recording-state-view.ui
diff --git a/src/libsysprof-ui/ui/sysprof-tab.ui b/src/libsysprof-ui/sysprof-tab.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-tab.ui
rename to src/libsysprof-ui/sysprof-tab.ui
diff --git a/src/libsysprof-ui/ui/sysprof-time-label.ui b/src/libsysprof-ui/sysprof-time-label.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-time-label.ui
rename to src/libsysprof-ui/sysprof-time-label.ui
diff --git a/src/libsysprof-ui/ui/sysprof-visualizer-view.ui b/src/libsysprof-ui/sysprof-visualizer-view.ui
similarity index 100%
rename from src/libsysprof-ui/ui/sysprof-visualizer-view.ui
rename to src/libsysprof-ui/sysprof-visualizer-view.ui