From e401a3cdda547e2fdf4a5397c7ab42f7d640e5ba Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 20 Jun 2006 18:29:28 +0000 Subject: [PATCH] Default icon size is 24 in list mode --- src/browser.c | 8 ++++++++ src/mime.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/browser.c b/src/browser.c index 78f70a8..93c0b36 100644 --- a/src/browser.c +++ b/src/browser.c @@ -246,10 +246,18 @@ static int _new_pixbufs(Browser * browser) browser->theme = gtk_icon_theme_new(); gtk_icon_theme_set_custom_theme(browser->theme, "gnome"); if((browser->pb_file = gtk_icon_theme_load_icon(browser->theme, +#if GTK_CHECK_VERSION(2, 6, 0) "gnome-fs-regular", 48, 0, NULL)) == NULL) +#else + "gnome-fs-regular", 24, 0, NULL)) == NULL) +#endif return FALSE; browser->pb_folder = gtk_icon_theme_load_icon(browser->theme, +#if GTK_CHECK_VERSION(2, 6, 0) "gnome-fs-directory", 48, 0, NULL); +#else + "gnome-fs-directory", 24, 0, NULL); +#endif return browser->pb_folder != NULL; } diff --git a/src/mime.c b/src/mime.c index 5c62342..81a5667 100644 --- a/src/mime.c +++ b/src/mime.c @@ -169,14 +169,23 @@ GdkPixbuf * mime_icon(Mime * mime, GtkIconTheme * theme, char const * type) return mime->types[i].icon; strncpy(&buf[11], type, sizeof(buf)-11); for(; (p = strchr(&buf[11], '/')) != NULL; *p = '-'); +#if GTK_CHECK_VERSION(2, 6, 0) if((mime->types[i].icon = gtk_icon_theme_load_icon(theme, buf, 48, 0, +#else + if((mime->types[i].icon = gtk_icon_theme_load_icon(theme, buf, 24, 0, +#endif NULL)) == NULL) { if((p = strchr(&buf[11], '-')) != NULL) { *p = '\0'; +#if GTK_CHECK_VERSION(2, 6, 0) mime->types[i].icon = gtk_icon_theme_load_icon(theme, buf, 48, 0, NULL); +#else + mime->types[i].icon = gtk_icon_theme_load_icon(theme, + buf, 24, 0, NULL); +#endif } } return mime->types[i].icon;