rpms/pcmanfm/devel pcmanfm-0.5-icon-fallback.patch, 1.2, 1.3 pcmanfm.spec, 1.26, 1.27

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2466

Modified Files:
	pcmanfm-0.5-icon-fallback.patch pcmanfm.spec 
Log Message:
* Fri Aug  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-5
- More fallback


pcmanfm-0.5-icon-fallback.patch:

Index: pcmanfm-0.5-icon-fallback.patch
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm-0.5-icon-fallback.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmanfm-0.5-icon-fallback.patch	30 Jul 2008 04:24:57 -0000	1.2
+++ pcmanfm-0.5-icon-fallback.patch	7 Aug 2008 17:40:31 -0000	1.3
@@ -1,6 +1,6 @@
---- pcmanfm-0.5/src/vfs/vfs-mime-type.c.icon_	2008-07-30 13:05:02.000000000 +0900
-+++ pcmanfm-0.5/src/vfs/vfs-mime-type.c	2008-07-30 13:21:48.000000000 +0900
-@@ -278,6 +278,61 @@
+--- pcmanfm-0.5/src/vfs/vfs-mime-type.c.icon_	2008-08-08 01:41:30.000000000 +0900
++++ pcmanfm-0.5/src/vfs/vfs-mime-type.c	2008-08-08 02:33:05.000000000 +0900
+@@ -278,6 +278,65 @@
          }
      }
  
@@ -13,43 +13,48 @@
 +	char *mime_t = mime_type ->type;
 +	if (strstr(mime_t, "audio/") == mime_t)
 +		icon = vfs_load_icon ( icon_theme, "audio-x-generic", size );
-+	if (strstr(mime_t, "image/") == mime_t)
++	else if (strstr(mime_t, "image/") == mime_t)
 +		icon = vfs_load_icon ( icon_theme, "image-x-generic", size );
-+	if (strstr(mime_t, "text/") == mime_t)
-+		icon = vfs_load_icon ( icon_theme, "text-x-generic", size );
-+	if (strstr(mime_t, "video/") == mime_t)
++	else if (strstr(mime_t, "video/") == mime_t)
 +		icon = vfs_load_icon ( icon_theme, "video-x-generic", size );
 +
-+ 	if (strstr(mime_t, "-cert"))
++	else if (strstr(mime_t, "x-font"))
++		icon = vfs_load_icon ( icon_theme, "font-x-generic", size);
++
++	else if (strstr(mime_t, "/msword"))
++		icon = vfs_load_icon ( icon_theme, "x-office-document", size);
++	else if (strstr(mime_t, "presentation"))
++		icon = vfs_load_icon ( icon_theme, "x-office-presentation", size);
++	else if (strstr(mime_t, "opendocument"))
++		icon = vfs_load_icon ( icon_theme, "x-office-document", size);
++
++
++ 	else if (strstr(mime_t, "-cert"))
 +		icon = vfs_load_icon ( icon_theme, "application-certificate", size);
-+	if (
++	else if (strstr(mime_t, "/xml"))
++		icon = vfs_load_icon ( icon_theme, "text-x-generic", size);
++
++	else if (
 +		strstr(mime_t, "-archive") ||
 +		strstr(mime_t, "compressed") || 
 +#if 1
 +		strstr(mime_t, "gzip") ||
 +		strstr(mime_t, "bzip2") ||
++		strstr(mime_t, "zip") ||
 +#endif 
++		strstr(mime_t, "x-rar") ||
 +		strstr(mime_t, "x-rpm") ||
 +		strstr(mime_t, "x-tar")
 +	)
 +		icon = vfs_load_icon ( icon_theme, "package-x-generic", size);
-+	if (strstr(mime_t, "/xml"))
-+		icon = vfs_load_icon ( icon_theme, "text-x-generic", size);
-+	if (strstr(mime_t, "/msword"))
-+		icon = vfs_load_icon ( icon_theme, "x-office-document", size);
-+	if (strstr(mime_t, "presentation"))
-+		icon = vfs_load_icon ( icon_theme, "x-office-presentation", size);
-+ 	if (
++ 	else if (
 +		strstr(mime_t, "script") ||
 +		strstr(mime_t, "x-perl") ||
 +		strstr(mime_t, "x-ruby")
 +	)
 +		icon = vfs_load_icon ( icon_theme, "text-x-script", size);
-+
-+	if (strstr(mime_t, "opendocument"))
-+		icon = vfs_load_icon ( icon_theme, "x-office-document", size);
-+
-+
++	else if (strstr(mime_t, "text/") == mime_t)
++		icon = vfs_load_icon ( icon_theme, "text-x-generic", size );
 +    }
 +
 +    /* fallback */
@@ -58,7 +63,6 @@
 +	icon = vfs_load_icon ( icon_theme, "gtk-file", size );
 +#endif
 +
-+
      if ( big )
          mime_type->big_icon = icon;
      else


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pcmanfm.spec	30 Jul 2008 04:24:57 -0000	1.26
+++ pcmanfm.spec	7 Aug 2008 17:40:31 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:		pcmanfm
 Version:	0.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -134,6 +134,9 @@
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Fri Aug  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-5
+- More fallback
+
 * Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-4
 - More fallback for gnome-icon-theme 2.23.X (F-10)