1998-12-11 Federico Mena Quintero <federico@nuclecu.unam.mx>

* gicon.c (gicon_get_icon_for_file): First try to fetch the inline
	icon data (i.e. thumbnails), second try the generic icon filename.

gnome/ChangeLog

@@ -1,3 +1,8 @@
+1998-12-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gicon.c (gicon_get_icon_for_file): First try to fetch the inline
+	icon data (i.e. thumbnails), second try the generic icon filename.
+
 1998-12-11  Owen Taylor  <otaylor@redhat.com>
 
 	* gdesktop.c (window_button_press): Ehen cancelling editing

gnome/gicon.c

@@ -223,22 +223,22 @@ gicon_get_icon_for_file (file_entry *fe)
 
 
 	/*
-	 * 2. Try to fetch the icon from the metadata.
+	 * 2. Try to fetch the icon as an inline png from the metadata.
 	 */
-	if (gnome_metadata_get (fe->fname, "icon-filename", &size, &buf) == 0){
+	if (gnome_metadata_get (fe->fname, "icon-inline-png", &size, &buf) == 0){
-		image = gicon_get_by_filename (buf);
+		image = gdk_imlib_inlined_png_to_image (buf, size);
+
+		free (buf);
 		
 		if (image)
 			return image;
 	}
 
 	/*
-	 * 3. Try to fetch the icon as an inline png from the metadata.
+	 * 3. Try to fetch the icon from the metadata.
 	 */
-	if (gnome_metadata_get (fe->fname, "icon-inline-png", &size, &buf) == 0){
+	if (gnome_metadata_get (fe->fname, "icon-filename", &size, &buf) == 0){
-		image = gdk_imlib_inlined_png_to_image (buf, size);
+		image = gicon_get_by_filename (buf);
-
-		free (buf);
 
 		if (image)
 			return image;