summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:39:17 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:39:17 +0100
commit3253d99365813f2d2ffd05e10cbb8c11f53d746e (patch)
tree0ab6f04d9051dc4ada1c4f977a01308227767234 /misc
parente69c1b746d63bf794316669471474ab57c8cd40a (diff)
New upstream version 0.26.0upstream/0.26.0
Diffstat (limited to 'misc')
-rw-r--r--misc/Makefile.in8
-rw-r--r--misc/org.yorba.shotwell.gschema.xml6
2 files changed, 8 insertions, 6 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in
index b69d514..ece7535 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -90,9 +90,7 @@ build_triplet = @build@
host_triplet = @host@
subdir = misc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
- $(top_srcdir)/m4/ax_check_enable_debug.m4 \
- $(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_generate_changelog.m4 \
$(top_srcdir)/m4/ax_is_release.m4 \
$(top_srcdir)/m4/ax_require_defined.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
@@ -170,6 +168,9 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
API_VERSION = @API_VERSION@
APPSTREAM_UTIL = @APPSTREAM_UTIL@
AR = @AR@
+AUTHENTICATOR_CFLAGS = @AUTHENTICATOR_CFLAGS@
+AUTHENTICATOR_LIBS = @AUTHENTICATOR_LIBS@
+AUTHENTICATOR_PACKAGES = @AUTHENTICATOR_PACKAGES@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -257,6 +258,7 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
PLUGIN_LIBS = @PLUGIN_LIBS@
POSUB = @POSUB@
+PUBLISHER_VALAFLAGS = @PUBLISHER_VALAFLAGS@
PUBLISHING_CFLAGS = @PUBLISHING_CFLAGS@
PUBLISHING_LIBS = @PUBLISHING_LIBS@
RANLIB = @RANLIB@
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index ce3b815..afd2f02 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -668,7 +668,7 @@
</key>
<key name="size-selection" type="i">
- <default>3</default>
+ <default>-1</default>
<summary>size selection</summary>
<description>The index of the current print size in a pre-defined list of standard sizes</description>
</key>
@@ -789,13 +789,13 @@
<key name="transitions-circles" type="b">
<default>true</default>
- <summary>enable slideshow circle transition</summary>
+ <summary>enable slideshow circles transition</summary>
<description>True if the Circles slideshow transition plugin is enabled, false otherwise</description>
</key>
<key name="transitions-blinds" type="b">
<default>true</default>
- <summary>enable slideshow slide transition</summary>
+ <summary>enable slideshow blinds transition</summary>
<description>True if the Blinds slideshow transition plugin is enabled, false otherwise</description>
</key>