projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8143bdc
)
Revert "FIXME: this can be rather slow and blocks until the size is known"
author
Colin Clark
<colin.clark@cclark.uk>
Fri, 12 May 2023 09:01:28 +0000
(10:01 +0100)
committer
Colin Clark
<colin.clark@cclark.uk>
Fri, 12 May 2023 09:01:28 +0000
(10:01 +0100)
This reverts commit
8aeeb06fa5ab39f9e58938c2a8af3029fd67cbff
.
Uncomment the callbacks.
src/image-load.cc
patch
|
blob
|
history
diff --git
a/src/image-load.cc
b/src/image-load.cc
index
03582d1
..
d8395cd
100644
(file)
--- a/
src/image-load.cc
+++ b/
src/image-load.cc
@@
-1156,40
+1156,39
@@
void image_loader_delay_area_ready(ImageLoader *il, gboolean enable)
/**************************************************************************************/
/* execution via idle calls */
/**************************************************************************************/
/* execution via idle calls */
-//static gboolean image_loader_idle_cb(gpointer data)
-//{
- //gboolean ret = FALSE;
- //ImageLoader *il = static_cast<ImageLoader *>(data);
-
- //if (il->idle_id)
- //{
- //ret = image_loader_continue(il);
- //}
+static gboolean image_loader_idle_cb(gpointer data)
+{
+ gboolean ret = FALSE;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
-
//if (!ret
)
-
//
{
-
//image_loader_stop_sourc
e(il);
-
//
}
+
if (il->idle_id
)
+ {
+
ret = image_loader_continu
e(il);
+ }
- //return ret;
-//}
+ if (!ret)
+ {
+ image_loader_stop_source(il);
+ }
+ return ret;
+}
-
//
static gboolean image_loader_start_idle(ImageLoader *il)
-
//
{
-
//
gboolean ret;
+static gboolean image_loader_start_idle(ImageLoader *il)
+{
+ gboolean ret;
-
//
if (!il) return FALSE;
+ if (!il) return FALSE;
-
//
if (!il->fd) return FALSE;
+ if (!il->fd) return FALSE;
-
//
if (!image_loader_setup_source(il)) return FALSE;
+ if (!image_loader_setup_source(il)) return FALSE;
-
//
ret = image_loader_begin(il);
+ ret = image_loader_begin(il);
-
//
if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL);
-
//
return ret;
-
//
}
+ if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL);
+ return ret;
+}
/**************************************************************************************/
/* execution via thread */
/**************************************************************************************/
/* execution via thread */