summaryrefslogtreecommitdiff
path: root/src/xsane-batch-scan.c
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2005-11-21 21:49:19 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:12 +0000
commit91e0f8f4872781ae41c44747330935d6420534e6 (patch)
tree39db641abe297fb735853015b906d7763651941e /src/xsane-batch-scan.c
parent13a92fd57322d6de4548e7dc992db591a0a54ee3 (diff)
parent6fceea28608be0fda32d94f59e1b1550774318a0 (diff)
Imported Debian patch 0.98-1debian/0.98-1
Diffstat (limited to 'src/xsane-batch-scan.c')
-rw-r--r--src/xsane-batch-scan.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/xsane-batch-scan.c b/src/xsane-batch-scan.c
index bf5f57c..c7ae532 100644
--- a/src/xsane-batch-scan.c
+++ b/src/xsane-batch-scan.c
@@ -505,14 +505,11 @@ static void xsane_batch_scan_scan_list(void)
while (xsane.scanning)
{
-#if 0
+ /* we MUST call gtk_events_pending() or gdk_input_add will not work! */
if (gtk_events_pending())
{
gtk_main_iteration();
}
-#elseif
- gtk_main_iteration();
-#endif
}
if ( (xsane.status_of_last_scan != SANE_STATUS_GOOD) && (xsane.status_of_last_scan != SANE_STATUS_EOF) )