[gnome-break-timer] Fix translation building



commit b790acd2406f470d10d2ecbdebefa4b8f29ebe5b
Author: Dylan McCall <dylan dylanmccall ca>
Date:   Thu Nov 19 17:42:24 2020 -0800

    Fix translation building

 .gitignore                                        | 1 +
 data/gresource/meson.build                        | 2 +-
 data/gresource/org.gnome.BreakTimer.gresource.xml | 2 +-
 src/settings/MainWindow.vala                      | 4 ++--
 {data/gresource => ui}/settings-panels.ui         | 0
 5 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 774a17e..61490c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .libs
 .flatpak-builder
 /build
+/po/gnome-break-timer.pot
diff --git a/data/gresource/meson.build b/data/gresource/meson.build
index 457116e..4bc9c23 100644
--- a/data/gresource/meson.build
+++ b/data/gresource/meson.build
@@ -1,7 +1,7 @@
 break_timer_resources = gnome.compile_resources(
     'resources',
     'org.gnome.BreakTimer.gresource.xml',
-    source_dir : '.',
+    source_dir : meson.source_root(),
     c_name : 'gnome_break_timer_resources'
 )
 
diff --git a/data/gresource/org.gnome.BreakTimer.gresource.xml 
b/data/gresource/org.gnome.BreakTimer.gresource.xml
index b2f6037..65bd04f 100644
--- a/data/gresource/org.gnome.BreakTimer.gresource.xml
+++ b/data/gresource/org.gnome.BreakTimer.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/BreakTimer/settings">
-    <file preprocess="xml-stripblanks">settings-panels.ui</file>
+    <file preprocess="xml-stripblanks">ui/settings-panels.ui</file>
   </gresource>
 </gresources>
diff --git a/src/settings/MainWindow.vala b/src/settings/MainWindow.vala
index 2bd7dd8..ef35e35 100644
--- a/src/settings/MainWindow.vala
+++ b/src/settings/MainWindow.vala
@@ -108,8 +108,8 @@ public class MainWindow : Gtk.ApplicationWindow, GLib.Initable {
 
         Gtk.Builder builder = new Gtk.Builder ();
         try {
-            builder.add_from_resource ("/org/gnome/BreakTimer/settings/settings-panels.ui");
-        } catch (Error e) {
+            builder.add_from_resource ("/org/gnome/BreakTimer/settings/ui/settings-panels.ui");
+        } catch (GLib.Error e) {
             GLib.error ("Error loading UI: %s", e.message);
         }
 
diff --git a/data/gresource/settings-panels.ui b/ui/settings-panels.ui
similarity index 100%
rename from data/gresource/settings-panels.ui
rename to ui/settings-panels.ui


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