Merge branch 'release/0.28.3-1'0.28.3-1

6 files changed, 47 insertions, 13 deletions

diff --git a/misc/Makefile.am b/misc/Makefile.am
index aa9a2bd..803697d 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -12,9 +12,6 @@ desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 $(appstream_XML) : $(appstream_in_files)
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-%.desktop.in : %.desktop.in.in
-	$(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
 %.desktop : %.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
@@ -24,8 +21,8 @@ $(appstream_XML) : $(appstream_in_files)
 CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
 
 dist_noinst_DATA = \
-	$(srcdir)/shotwell.desktop.in.in \
-	$(srcdir)/shotwell-viewer.desktop.in.in \
+	$(srcdir)/shotwell.desktop.in \
+	$(srcdir)/shotwell-viewer.desktop.in \
 	$(gsettings_SCHEMAS) \
 	$(appstream_in_files)
 
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 0571904..11e02ae 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -353,8 +353,8 @@ desktopdir = $(datadir)/applications
 desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
 dist_noinst_DATA = \
-	$(srcdir)/shotwell.desktop.in.in \
-	$(srcdir)/shotwell-viewer.desktop.in.in \
+	$(srcdir)/shotwell.desktop.in \
+	$(srcdir)/shotwell-viewer.desktop.in \
 	$(gsettings_SCHEMAS) \
 	$(appstream_in_files)
 
@@ -579,9 +579,6 @@ uninstall-am: uninstall-desktopDATA
 $(appstream_XML) : $(appstream_in_files)
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-%.desktop.in : %.desktop.in.in
-	$(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
 %.desktop : %.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
diff --git a/misc/meson.build b/misc/meson.build
new file mode 100644
index 0000000..664ddb0
--- /dev/null
+++ b/misc/meson.build
@@ -0,0 +1,28 @@
+podir = join_paths('..', 'po')
+
+i18n.merge_file(input : 'shotwell.appdata.xml.in',
+                output : 'shotwell.appdata.xml',
+                po_dir : join_paths('..', 'po'),
+                type : 'xml',
+                install: true,
+                install_dir : join_paths(get_option('datadir'), 'metainfo'))
+
+i18n.merge_file(input : 'shotwell.desktop.in',
+                output: 'shotwell.desktop',
+                po_dir : podir,
+                type : 'desktop',
+                install : true,
+                install_dir : join_paths(get_option('datadir'), 'applications'))
+
+i18n.merge_file(input : 'shotwell-viewer.desktop.in',
+                output: 'shotwell-viewer.desktop',
+                po_dir : podir,
+                type : 'desktop',
+                install : true,
+                install_dir : join_paths(get_option('datadir'), 'applications'))
+
+install_data(['org.yorba.shotwell-extras.gschema.xml',
+              'org.yorba.shotwell.gschema.xml'],
+              install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
+
+gnome.compile_schemas()
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index afd2f02..2bd9003 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -161,7 +161,19 @@
         <summary>background color</summary>
         <description>A grayscale color for use as the background color.</description>
     </key>
-    
+
+    <key name="transparent-background-type" type="s">
+        <default>'checkered'</default>
+        <summary>background for transparent images</summary>
+        <description>The background to use for transparent images.</description>
+    </key>
+
+    <key name="transparent-background-color" type="s">
+        <default>'#444'</default>
+        <summary>color for solid transparency background</summary>
+        <description>Color to use if background for transparent images is set to solid color</description>
+    </key>
+
     <key name="hide-photos-already-imported" type="b">
         <default>false</default>
         <summary>Selection state of “hide photos” option</summary>
diff --git a/misc/shotwell-viewer.desktop.in.in b/misc/shotwell-viewer.desktop.in
index b5e41f3..b5e41f3 100644
--- a/misc/shotwell-viewer.desktop.in.in
+++ b/misc/shotwell-viewer.desktop.in
diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in
index aa1ede2..aa1ede2 100644
--- a/misc/shotwell.desktop.in.in
+++ b/misc/shotwell.desktop.in