Index: Makefile.am =================================================================== RCS file: /var/cvs/xfce/xfce4/libxfcegui4/Makefile.am,v retrieving revision 1.16 diff -u -r1.16 Makefile.am --- Makefile.am 19 Sep 2004 15:21:25 -0000 1.16 +++ Makefile.am 3 Nov 2004 20:39:41 -0000 @@ -1,4 +1,4 @@ -SUBDIRS = libxfcegui4 xfce4-modules docs po +SUBDIRS = libxfcegui4 xfce4-modules docs po pixmaps EXTRA_DIST = libxfcegui4.spec index.theme Index: configure.ac =================================================================== RCS file: /var/cvs/xfce/xfce4/libxfcegui4/configure.ac,v retrieving revision 1.90 diff -u -r1.90 configure.ac --- configure.ac 2 Nov 2004 13:34:08 -0000 1.90 +++ configure.ac 3 Nov 2004 20:39:41 -0000 @@ -119,6 +119,7 @@ libxfcegui4/libxfcegui4-1.0.pc libxfcegui4/libxfcegui4-config.h libxfcegui4/Makefile +pixmaps/Makefile xfce4-modules/Makefile xfce4-modules/mime/Makefile xfce4-modules/headers/Makefile Index: libxfcegui4/xfce-icontheme.c =================================================================== RCS file: /var/cvs/xfce/xfce4/libxfcegui4/libxfcegui4/xfce-icontheme.c,v retrieving revision 1.27 diff -u -r1.27 xfce-icontheme.c --- libxfcegui4/xfce-icontheme.c 26 Oct 2004 06:56:34 -0000 1.27 +++ libxfcegui4/xfce-icontheme.c 3 Nov 2004 20:39:42 -0000 @@ -376,10 +376,8 @@ xfce_icon_theme_class_init(XfceIconThemeClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - GSList *pix_formats, *l; - gchar **pix_mimetypes; - gint i; - + GdkPixbuf *svg_test; + parent_class = g_type_class_peek_parent(klass); gobject_class->finalize = xfce_icon_theme_finalize; @@ -409,23 +407,16 @@ } /* check SVG format support */ - pix_formats = gdk_pixbuf_get_formats(); - for(l = pix_formats; l; l = l->next) { - GdkPixbufFormat *fmt = l->data; - pix_mimetypes = gdk_pixbuf_format_get_mime_types(fmt); - for(i = 0; pix_mimetypes[i]; i++) { - if(!g_ascii_strcasecmp(pix_mimetypes[i], "image/svg")) { - supported_icon_ext = (gchar **)icon_ext_with_svg; - break; - } - } - g_strfreev(pix_mimetypes); - } - if(pix_formats) - g_slist_free(pix_formats); - - if(!supported_icon_ext) + svg_test = gdk_pixbuf_new_from_file(DATADIR "/xfce4/xfce-svg-test.svg", + NULL); + if(svg_test) { + supported_icon_ext = (gchar **)icon_ext_with_svg; + g_object_unref(G_OBJECT(svg_test)); + DBG("SVG support enabled!"); + } else { supported_icon_ext = (gchar **)icon_ext; + DBG("SVG support disabled!"); + } } static void --- /dev/null 2004-10-29 20:48:48.694355048 -0700 +++ pixmaps/Makefile.am 2004-11-03 12:27:12.000000000 -0800 @@ -0,0 +1,4 @@ +pixmapsdir = $(datadir)/xfce4 +pixmaps_DATA = xfce-svg-test.svg + +EXTRA_DIST = $(pixmaps_DATA) --- /dev/null 2004-10-29 20:48:48.694355048 -0700 +++ pixmaps/xfce-svg-test.svg 2004-11-03 12:25:31.000000000 -0800 @@ -0,0 +1,54 @@ + + + + + + + + +