(trunk gtk) and while we're on the subject, fix more tab damage
This commit is contained in:
parent
98d13da40c
commit
5eb2f5a274
22
gtk/icons.c
22
gtk/icons.c
|
@ -79,8 +79,7 @@ get_size_in_pixels( GtkWidget * widget,
|
||||||
|
|
||||||
|
|
||||||
static IconCache *
|
static IconCache *
|
||||||
icon_cache_new (GtkWidget * for_widget,
|
icon_cache_new (GtkWidget * for_widget, int icon_size)
|
||||||
int icon_size)
|
|
||||||
{
|
{
|
||||||
IconCache * icon_cache;
|
IconCache * icon_cache;
|
||||||
|
|
||||||
|
@ -132,9 +131,9 @@ _icon_cache_get_icon_key( GIcon * icon )
|
||||||
|
|
||||||
|
|
||||||
static GdkPixbuf *
|
static GdkPixbuf *
|
||||||
get_themed_icon_pixbuf( GThemedIcon *icon,
|
get_themed_icon_pixbuf( GThemedIcon * icon,
|
||||||
int size,
|
int size,
|
||||||
GtkIconTheme *icon_theme )
|
GtkIconTheme * icon_theme )
|
||||||
{
|
{
|
||||||
char ** icon_names = NULL;
|
char ** icon_names = NULL;
|
||||||
GtkIconInfo * icon_info;
|
GtkIconInfo * icon_info;
|
||||||
|
@ -162,8 +161,7 @@ get_themed_icon_pixbuf( GThemedIcon *icon,
|
||||||
|
|
||||||
|
|
||||||
static GdkPixbuf *
|
static GdkPixbuf *
|
||||||
get_file_icon_pixbuf( GFileIcon *icon,
|
get_file_icon_pixbuf( GFileIcon * icon, int size )
|
||||||
int size )
|
|
||||||
{
|
{
|
||||||
GFile * file;
|
GFile * file;
|
||||||
char * filename;
|
char * filename;
|
||||||
|
@ -180,9 +178,7 @@ get_file_icon_pixbuf( GFileIcon *icon,
|
||||||
|
|
||||||
|
|
||||||
static GdkPixbuf *
|
static GdkPixbuf *
|
||||||
_get_icon_pixbuf( GIcon *icon,
|
_get_icon_pixbuf( GIcon * icon, int size, GtkIconTheme * theme )
|
||||||
int size,
|
|
||||||
GtkIconTheme *theme )
|
|
||||||
{
|
{
|
||||||
if ( icon == NULL )
|
if ( icon == NULL )
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -195,8 +191,7 @@ _get_icon_pixbuf( GIcon *icon,
|
||||||
|
|
||||||
|
|
||||||
static GdkPixbuf *
|
static GdkPixbuf *
|
||||||
icon_cache_get_mime_type_icon( IconCache * icon_cache,
|
icon_cache_get_mime_type_icon( IconCache * icon_cache, const char * mime_type )
|
||||||
const char * mime_type )
|
|
||||||
{
|
{
|
||||||
GIcon * icon;
|
GIcon * icon;
|
||||||
const char * key = NULL;
|
const char * key = NULL;
|
||||||
|
@ -227,8 +222,7 @@ icon_cache_get_mime_type_icon( IconCache * icon_cache,
|
||||||
#else /* USE_GIO_ICONS */
|
#else /* USE_GIO_ICONS */
|
||||||
|
|
||||||
static GdkPixbuf *
|
static GdkPixbuf *
|
||||||
icon_cache_get_mime_type_icon( IconCache * icon_cache,
|
icon_cache_get_mime_type_icon( IconCache * icon_cache, const char * mime_type )
|
||||||
const char * mime_type )
|
|
||||||
{
|
{
|
||||||
GdkPixbuf * pixbuf;
|
GdkPixbuf * pixbuf;
|
||||||
const char * stock_name;
|
const char * stock_name;
|
||||||
|
|
Loading…
Reference in New Issue