Commit a889a9f9 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix imlib2 and x11 warnings when opening a URL that returned an HTTP error

parent 71eb9b41

ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ git HEAD 
    * Add --sort mtime option (patch by guns)

    * Add a desktop file (installed to share/applications/feh.desktop)

    * Use "feh -" to read image from stdin

    * Fix Imlib2 and X11 warnings when opening a URL that returned an HTTP

      error



Mon, 24 Dec 2012 15:45:54 +0100  Daniel Friesel <derf+feh@finalrewind.org>

src/imlib.c

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ int feh_load_image(Imlib_Image * im, feh_file * file) 
			|| (!strncmp(file->filename, "ftp://", 6))) {

		image_source = SRC_HTTP;



		tmpname = feh_http_load_image(file->filename);

		if ((tmpname = feh_http_load_image(file->filename)) == NULL)

			err = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST;

	}

	else

		*im = imlib_load_image_with_error_return(file->filename, &err);