summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-08-14 10:47:31 +0200
committerDaniel Friesel <derf@finalrewind.org>2012-08-14 10:47:31 +0200
commitd1f218caad102190c6075098c306d0dac4de83ae (patch)
tree5c62b734f34f411e9d5e650517e488113f463da2
parent503048c639e1017324e64313c7eb197b20201b40 (diff)
imlib.c: When opening via URL, always use URL as filename
-rw-r--r--ChangeLog2
-rw-r--r--src/imlib.c9
2 files changed, 3 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cc7838..571e5e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ git HEAD
** %o x,y image offset relative to top-left window corner
** %r image rotation
** %z image zoom
+ * Always use file URL as filename when opening http files.
+ (consequence: lossless rotate no longer works for such files)
Sun, 25 Mar 2012 13:13:26 +0200 Daniel Friesel <derf@finalrewind.org>
diff --git a/src/imlib.c b/src/imlib.c
index e7dcaeb..af7acdd 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -171,14 +171,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
file->ed = exif_get_data(tmpname);
#endif
}
- if ((opt.slideshow) && (opt.reload == 0) && (image_source != SRC_MAGICK)) {
- free(file->filename);
- file->filename = estrdup(tmpname);
-
- if (!opt.keep_http)
- add_file_to_rm_filelist(tmpname);
- }
- else if ((image_source == SRC_MAGICK) || !opt.keep_http)
+ if ((image_source == SRC_MAGICK) || !opt.keep_http)
unlink(tmpname);
free(tmpname);