p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:919a55c90b645b8e0df83af02bb0a0e533869b0a
Branches Tags
p:master
p:v1.0.0
...
compare: p:41bd25e7115d0d2ece922ed0db35f64ef61aaede
Branches Tags
p:master
p:v1.0.0

2 Commits
919a55c90b ... 41bd25e711

Author SHA1 Message Date
Přemysl Eric Janouch
41bd25e711
Avoid g_app_info_should_show() in context menus 
We were hiding our own JPEG cropper.
 2022-02-21 21:49:44 +01:00
Přemysl Eric Janouch
d9435c988c
Clean up 2022-02-21 21:20:16 +01:00
2 changed files with 10 additions and 17 deletions
Show Stats Expand all files Collapse all files

6
fiv-browser.c
View File

@ -792,8 +792,7 @@ make_context_menu(GtkWidget *widget, GFile *file)
}
for (GList *iter = recommended; iter; iter = iter->next) {
if (g_app_info_should_show(iter->data) &&
(!default_ || !g_app_info_equal(iter->data, default_)))
if (!default_ || !g_app_info_equal(iter->data, default_))
append_opener(menu, iter->data, ctx);
else
g_object_unref(iter->data);
@ -805,8 +804,7 @@ make_context_menu(GtkWidget *widget, GFile *file)
}
for (GList *iter = fallback; iter; iter = iter->next) {
if (g_app_info_should_show(iter->data) &&
(!default_ || !g_app_info_equal(iter->data, default_)))
if (!default_ || !g_app_info_equal(iter->data, default_))
append_opener(menu, iter->data, ctx);
else
g_object_unref(iter->data);

21
fiv-thumbnail.c
View File

@ -230,8 +230,7 @@ save_thumbnail(cairo_surface_t *thumbnail, const char *path, GString *thum)
}
static cairo_surface_t *
fiv_thumbnail_prepare(
GFile *target, GBytes *data, gboolean *color_managed, GError **error)
render(GFile *target, GBytes *data, gboolean *color_managed, GError **error)
{
FivIoOpenContext ctx = {
.uri = g_file_get_uri(target),
@ -253,7 +252,7 @@ fiv_thumbnail_prepare(
}
static gboolean
fiv_thumbnail_fallback(GFile *target, FivThumbnailSize size,
produce_fallback(GFile *target, FivThumbnailSize size,
cairo_surface_t **surface, GError **error)
{
goffset filesize = 0;
@ -277,8 +276,7 @@ fiv_thumbnail_fallback(GFile *target, FivThumbnailSize size,
return FALSE;
gboolean color_managed = FALSE;
cairo_surface_t *result =
fiv_thumbnail_prepare(target, data, &color_managed, error);
cairo_surface_t *result = render(target, data, &color_managed, error);
if (!result)
return FALSE;
@ -296,10 +294,8 @@ fiv_thumbnail_produce(GFile *target, FivThumbnailSize max_size,
max_size <= FIV_THUMBNAIL_SIZE_MAX, FALSE);
const gchar *path = g_file_peek_path(target);
if (!path || !g_file_is_native(target) /* Don't save sftp://. */) {
return fiv_thumbnail_fallback(
target, max_size, max_size_surface, error);
}
if (!path || !g_file_is_native(target) /* Don't save sftp://. */)
return produce_fallback(target, max_size, max_size_surface, error);
// Make the TOCTTOU issue favour unnecessary reloading.
GStatBuf st = {};
@ -313,14 +309,13 @@ fiv_thumbnail_produce(GFile *target, FivThumbnailSize max_size,
if (!mf) {
g_debug("%s: %s", path, e->message);
g_error_free(e);
return fiv_thumbnail_fallback(
target, max_size, max_size_surface, error);
return produce_fallback(target, max_size, max_size_surface, error);
}
gsize filesize = g_mapped_file_get_length(mf);
gboolean color_managed = FALSE;
cairo_surface_t *surface = fiv_thumbnail_prepare(
target, g_mapped_file_get_bytes(mf), &color_managed, error);
cairo_surface_t *surface =
render(target, g_mapped_file_get_bytes(mf), &color_managed, error);
g_mapped_file_unref(mf);
if (!surface)
return FALSE;