nautilus r13957 - in trunk: . libnautilus-private

[fcrozat svn gnome org]

Author: fcrozat
Date: Wed Mar 19 15:59:57 2008
New Revision: 13957
URL: http://svn.gnome.org/viewvc/nautilus?rev=13957&view=rev

Log:
2008-03-19  Frederic Crozat  <fcrozat mandriva com>

        * libnautilus-private/nautilus-link.c:
        Only strip icon name when it ends with a know
        icon extension.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-link.c

Modified: trunk/libnautilus-private/nautilus-link.c
==============================================================================
--- trunk/libnautilus-private/nautilus-link.c	(original)
+++ trunk/libnautilus-private/nautilus-link.c	Wed Mar 19 15:59:57 2008
@@ -345,7 +345,14 @@
 		if (!g_path_is_absolute (icon_copy)) {
 			/* Strip out any extension on non-filename icons. Old desktop files may have this */
 			p = strchr (icon_copy, '.');
-			if (p != NULL) {
+                        /* Only strip known icon extensions */
+			if ((p != NULL) &&
+                         ((g_ascii_strcasecmp (p, ".png") == 0)
+                       || (g_ascii_strcasecmp (p, ".svn") == 0)
+                       || (g_ascii_strcasecmp (p, ".jpg") == 0)
+                       || (g_ascii_strcasecmp (p, ".xpm") == 0)
+                       || (g_ascii_strcasecmp (p, ".bmp") == 0)
+                       || (g_ascii_strcasecmp (p, ".jpeg") == 0))) {
 				*p = 0;
 			}
 		}