comparison src/pixbuf_util.c @ 1458:dc406812db14

fixed loading of desktop file icons, gtk seems to expect an icon name without extension

1457:5c0ecb2ebbc5

#include "main.h"
#include "pixbuf_util.h"
#include "exif.h"

#include "icons/icons_inline.h"

#include <math.h>

                           &error);
	if (!pixbuf) 
		{
		if (error)
			{
			DEBUG_1("Couldn't load icon: %s", error->message);
			g_error_free(error);
			}
		return FALSE;
		}
	
	register_stock_icon(key, pixbuf);
	return TRUE;
}

1458:dc406812db14

#include "main.h"
#include "pixbuf_util.h"
#include "exif.h"
#include "ui_fileops.h"

#include "icons/icons_inline.h"

#include <math.h>

                           &error);
	if (!pixbuf) 
		{
		if (error)
			{
			DEBUG_1("Couldn't load icon %s: %s", icon, error->message);
			g_error_free(error);
			error = NULL;
			}
			
		if (strchr(icon, '.'))
			{
			/* try again without extension */
			gchar *icon2 = remove_extension_from_path(icon);
			pixbuf = gtk_icon_theme_load_icon(icon_theme,
		                           icon2, /* icon name */
		                           64, /* size */
		                           0,  /* flags */
		                           &error);
			if (error)
				{
				DEBUG_1("Couldn't load icon %s: %s", icon2, error->message);
				g_error_free(error);
				}
			g_free(icon2);
			}
		}

	if (!pixbuf) return FALSE;
	
	register_stock_icon(key, pixbuf);
	return TRUE;
}