Fix remaining compiler warnings (I probably won't implement these options anyways)

4 files changed, 6 insertions, 8 deletions

diff --git a/src/feh.h b/src/feh.h
index f81a3c0..47f8da6 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -145,7 +145,7 @@ struct hostent *feh_gethostbyname(const char *name);
 void slideshow_save_image(winwidget win);
 void feh_edit_inplace_orient(winwidget w, int orientation);
 void feh_edit_inplace_lossless_rotate(winwidget w, int orientation);
-gib_list *feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style);
+gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style);
 char *build_caption_filename(feh_file * file);
 gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num);
 
diff --git a/src/imlib.c b/src/imlib.c
index 099b132..1abd767 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -748,7 +748,7 @@ void feh_draw_caption(winwidget w)
 		D_RETURN_(4);
 	}
 
-	lines = feh_wrap_string(file->caption, w->w, w->h, fn, NULL);
+	lines = feh_wrap_string(file->caption, w->w, fn, NULL);
 	if (!lines)
 		D_RETURN_(4);
 
@@ -870,9 +870,7 @@ void feh_edit_inplace_orient(winwidget w, int orientation)
 	D_RETURN_(4);
 }
 
-/* TODO max_height is ignored... Could use a function which generates a
- * transparent text overlay image, with wrapping and all. Would be useful */
-gib_list *feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style)
+gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style)
 {
 	gib_list *ll, *lines = NULL, *list = NULL, *words;
 	gib_list *l = NULL;
diff --git a/src/thumbnail.c b/src/thumbnail.c
index 425fa8c..c472fc0 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -714,7 +714,7 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file)
 	if (td.cache_thumbnails) {
 		uri = feh_thumbnail_get_name_uri(file->filename);
 		thumb_file = feh_thumbnail_get_name(uri);
-		status = feh_thumbnail_get_generated(image, file, thumb_file, uri);
+		status = feh_thumbnail_get_generated(image, file, thumb_file);
 
 		if (!status)
 			status = feh_thumbnail_generate(image, file, thumb_file, uri);
@@ -832,7 +832,7 @@ int feh_thumbnail_generate(Imlib_Image * image, feh_file * file,
 	return (0);
 }
 
-int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri)
+int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file)
 {
 	struct stat sb;
 	char *c_mtime;
diff --git a/src/thumbnail.h b/src/thumbnail.h
index e096693..d015994 100644
--- a/src/thumbnail.h
+++ b/src/thumbnail.h
@@ -71,7 +71,7 @@ void feh_thumbnail_calculate_geometry(void);
 
 int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file);
 int feh_thumbnail_generate(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri);
-int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri);
+int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file);
 char *feh_thumbnail_get_name(char *uri);
 char *feh_thumbnail_get_name_uri(char *name);
 char *feh_thumbnail_get_name_md5(char *uri);