Merge tag 'upstream/3.12.0'

Upstream version 3.12.0

1 files changed, 0 insertions, 38 deletions

diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in
index da50c8a..3ce3d12 100644
--- a/data/org.gnome.SimpleScan.gschema.xml.in
+++ b/data/org.gnome.SimpleScan.gschema.xml.in
@@ -1,10 +1,4 @@
 <schemalist>
-  <enum id="org.gnome.SimpleScan.ScanDirection">
-    <value value="0" nick="top-to-bottom"/>
-    <value value="1" nick="left-to-right"/>
-    <value value="2" nick="bottom-to-top"/>
-    <value value="3" nick="right-to-left"/>
-  </enum>
   <enum id="org.gnome.SimpleScan.PageSide">
     <value value="1" nick="front"/>
     <value value="2" nick="back"/>
@@ -12,18 +6,6 @@
   </enum>
 
   <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
-    <key name="window-width" type="i">
-      <default>600</default>
-      <_summary>Window width in pixels</_summary>
-    </key>
-    <key name="window-height" type="i">
-      <default>400</default>
-      <_summary>Window height in pixels</_summary>
-    </key>
-    <key name="window-is-maximized" type="b">
-      <default>false</default>
-      <_summary>TRUE if the application window is maximized</_summary>
-    </key>
     <key name="selected-device" type="s">
       <default>''</default>
       <_summary>Device to scan from</_summary>
@@ -38,21 +20,6 @@
       <_summary>Type of document being scanned</_summary>
       <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description>
     </key>
-    <key name="scan-direction" enum="org.gnome.SimpleScan.ScanDirection">
-      <default>'top-to-bottom'</default>
-      <_summary>Direction of scan</_summary>
-      <_description>The direction of the scanner across the scanned page.</_description>
-    </key>
-    <key name="page-width" type="i">
-      <default>595</default>
-      <_summary>Width of scanned image in pixels</_summary>
-      <_description>The width of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
-    </key>
-    <key name="page-height" type="i">
-      <default>842</default>
-      <_summary>Height of scanned image in pixels</_summary>
-      <_description>The height of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
-    </key>
     <key name="paper-width" type="i">
       <default>0</default>
       <_summary>Width of paper in tenths of a mm</_summary>
@@ -73,11 +40,6 @@
         <_summary>Contrast of scan</_summary>
         <_description>The contrast adjustment from -100 to 100 (0 being none).</_description>
     </key>
-    <key name="page-dpi" type="i">
-      <default>72</default>
-      <_summary>Resolution of last scanned image</_summary>
-      <_description>The resolution in dots-per-inch of the previously scanned image.</_description>
-    </key>
     <key name="text-dpi" type="i">
       <default>150</default>
       <_summary>Resolution for text scans</_summary>