diff options
| -rw-r--r-- | man/feh.pre | 2 | ||||
| -rw-r--r-- | share/applications/feh.pre | 2 | ||||
| -rw-r--r-- | src/imlib.c | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/man/feh.pre b/man/feh.pre index 9389a54..f019811 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -468,6 +468,8 @@ Use as background for transparent image parts and the like. Accepted values: default, checks, or an XColor .Pq e.g. Qo black Qc or Qo #428bdd Qc . +Note that some shells treat the hash symbol as a special character, so you +may need to quote or escape it for the XColor code to work. . In windowed mode, the default is checks .Pq a checkered background so transparent image parts are easy to see . diff --git a/share/applications/feh.pre b/share/applications/feh.pre index 5f7a495..fe23468 100644 --- a/share/applications/feh.pre +++ b/share/applications/feh.pre @@ -9,5 +9,5 @@ Terminal=false Type=Application Icon=feh Categories=Graphics;2DGraphics;Viewer; -MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap; +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/webp;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap; NoDisplay=true diff --git a/src/imlib.c b/src/imlib.c index 13fd1df..b9f071a 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -542,7 +542,11 @@ static char *feh_magick_load_image(char *filename) #ifdef HAVE_LIBCURL +#if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */ static int curl_quit_function(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) +#else +static int curl_quit_function(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) +#endif { // ignore "unused parameter" warnings (void)clientp; @@ -617,6 +621,8 @@ static char *feh_http_load_image(char *url) curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); #if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */ curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, curl_quit_function); +#else + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_quit_function); #endif curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); if (opt.insecure_ssl) { |