summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-04-30 19:25:09 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-04-30 19:25:09 +0200
commit1d2f47520c4aa0f47459246d660485ef6b80cc48 (patch)
tree41549a3ebec3c60afde4554daa61c3c19e266b16 /src
parentd427874ae9bf8393c9ee6b020bf8b62f531dd4dd (diff)
parent6434f7a5b8bdb0c4cf71879d0c904938cf44dcc5 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src')
-rw-r--r--src/app-window.vala4
-rw-r--r--src/preferences-dialog.vala28
-rw-r--r--src/scanner.vala2
-rw-r--r--src/screensaver.vala4
-rw-r--r--src/simple-scan.vala6
5 files changed, 22 insertions, 22 deletions
diff --git a/src/app-window.vala b/src/app-window.vala
index 2cd75ee..1475e0a 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -1193,7 +1193,7 @@ public class AppWindow : Gtk.ApplicationWindow
yield book.save_async (type, settings.get_int ("jpeg-quality"), file, null, null);
var command_line = "xdg-email";
if (type == "pdf")
- command_line += "--attach %s".printf (file.get_path ());
+ command_line += " --attach %s".printf (file.get_path ());
else
{
for (var i = 0; i < book.n_pages; i++) {
@@ -1285,7 +1285,7 @@ public class AppWindow : Gtk.ApplicationWindow
"authors", authors,
"translator-credits", _("translator-credits"),
"website", "https://launchpad.net/simple-scan",
- "copyright", "Copyright © 2009-2015 Canonical Ltd.",
+ "copyright", "Copyright © 2009-2018 Canonical Ltd.",
"license", license,
"wrap-license", true,
null);
diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
index bf213fb..962fa79 100644
--- a/src/preferences-dialog.vala
+++ b/src/preferences-dialog.vala
@@ -144,11 +144,11 @@ private class PreferencesDialog : Gtk.Dialog
});
set_page_delay (settings.get_int ("page-delay"));
- page_delay_3s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 3); });
- page_delay_5s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 5); });
- page_delay_7s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 7); });
- page_delay_10s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 10); });
- page_delay_15s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 15); });
+ page_delay_3s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 3000); });
+ page_delay_5s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 5000); });
+ page_delay_7s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 7000); });
+ page_delay_10s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 10000); });
+ page_delay_15s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 15000); });
}
public void set_scan_devices (List<ScanDevice> devices)
@@ -399,26 +399,26 @@ private class PreferencesDialog : Gtk.Dialog
public int get_page_delay ()
{
if (page_delay_15s_button.active)
- return 15;
+ return 15000;
else if (page_delay_10s_button.active)
- return 10;
+ return 10000;
else if (page_delay_7s_button.active)
- return 7;
+ return 7000;
else if (page_delay_5s_button.active)
- return 5;
+ return 5000;
else
- return 3;
+ return 3000;
}
public void set_page_delay (int page_delay)
{
- if (page_delay >= 15)
+ if (page_delay >= 15000)
page_delay_15s_button.active = true;
- else if (page_delay >= 10)
+ else if (page_delay >= 1000)
page_delay_10s_button.active = true;
- else if (page_delay >= 7)
+ else if (page_delay >= 7000)
page_delay_7s_button.active = true;
- else if (page_delay >= 5)
+ else if (page_delay >= 5000)
page_delay_5s_button.active = true;
else
page_delay_3s_button.active = true;
diff --git a/src/scanner.vala b/src/scanner.vala
index f98b4b6..cd7c300 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -1155,7 +1155,7 @@ public class Scanner
if ((option.cap & Sane.Capability.INACTIVE) != 0)
return;
- /* Some options are unnammed (e.g. Option 0) */
+ /* Some options are unnamed (e.g. Option 0) */
if (option.name == null)
return;
diff --git a/src/screensaver.vala b/src/screensaver.vala
index ef2dfb8..a040999 100644
--- a/src/screensaver.vala
+++ b/src/screensaver.vala
@@ -18,8 +18,8 @@ public interface FreedesktopScreensaver : Object
}
[DBus (name = "Inhibit")]
- public abstract uint32 inhibit (string application_name, string reason_for_inhibit) throws IOError;
+ public abstract uint32 inhibit (string application_name, string reason_for_inhibit) throws Error;
[DBus (name = "UnInhibit")]
- public abstract void uninhibit (uint32 cookie) throws IOError;
+ public abstract void uninhibit (uint32 cookie) throws Error;
}
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 841e702..d029cd7 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -165,7 +165,7 @@ public class SimpleScan : Gtk.Application
* print ('{ ' + ', '.join (ids) + ' }')
*/
- /* HPAIO IDs extraced using the following Python:
+ /* HPAIO IDs extracted using the following Python:
* import sys
* ids = []
* for f in sys.argv:
@@ -422,7 +422,7 @@ public class SimpleScan : Gtk.Application
inhibit_cookie = fdss.inhibit ("Simple-Scan", reason);
}
}
- catch (IOError error) {}
+ catch (Error error) {}
}
}
else
@@ -438,7 +438,7 @@ public class SimpleScan : Gtk.Application
{
fdss.uninhibit (inhibit_cookie);
}
- catch (IOError error) {}
+ catch (Error error) {}
fdss = null;
}