7 files changed, 72 insertions, 51 deletions

diff --git a/x11-fm/file_menu_applet/Makefile b/x11-fm/file_menu_applet/Makefile
index 770cb69306db..409b813bb528 100644
--- a/x11-fm/file_menu_applet/Makefile
+++ b/x11-fm/file_menu_applet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	file_menu_applet
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	http://www.zoned.net:8000/~xkahn/file_menu_applet/
 
diff --git a/x11-fm/file_menu_applet/distinfo b/x11-fm/file_menu_applet/distinfo
index 00451ceb303f..19bbe6f2e733 100644
--- a/x11-fm/file_menu_applet/distinfo
+++ b/x11-fm/file_menu_applet/distinfo
@@ -1 +1 @@
-MD5 (file_menu_applet-0.4.tar.gz) = 611cf15b5b52e821f8ce056df1fe74ee
+MD5 (file_menu_applet-0.5.tar.gz) = 2038c3bf76485c17f6e8c8096d69cfd5
diff --git a/x11-fm/file_menu_applet/files/patch-aa b/x11-fm/file_menu_applet/files/patch-aa
deleted file mode 100644
index 14f8f468fc6d..000000000000
--- a/x11-fm/file_menu_applet/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Mon May  6 02:39:52 2002
-+++ src/Makefile.in	Mon May  6 02:40:05 2002
-@@ -107,7 +107,7 @@
- 	-DLOCALEDIR=\""$(datadir)/locale"\"     \
- 	-DIMAGEDIR=\""$(datadir)/pixmaps"\"     \
- 	-DICONDIR=\""$(datadir)/images/file_menu_applet"\"      \
--	-DMIMEICONDIR=\"$(datadir)/pixmaps/nautilus\" \
-+	-DMIMEICONDIR=\"$(datadir)/pixmaps\" \
- 	-DGLADEDIR=\""$(gladedir)"\"
- 
- 
diff --git a/x11-fm/file_menu_applet/files/patch-ab b/x11-fm/file_menu_applet/files/patch-ab
deleted file mode 100644
index d14a73cdf585..000000000000
--- a/x11-fm/file_menu_applet/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/flist-mime-icon.c.orig	Mon May  6 02:42:16 2002
-+++ src/flist-mime-icon.c	Mon May  6 02:43:24 2002
-@@ -107,8 +107,11 @@
- 		if (!g_file_exists (icon)) {
- 		  file = g_concat_dir_and_file (MIMEICONDIR, icon);
- 		  if (!g_file_exists (file)) {
--		    g_free (file);
--		    return NULL;
-+		    file = g_concat_dir_and_file(g_strdup_printf ("%s/%s", MIMEICONDIR, "nautilus"), icon);
-+		     if (!g_file_exists (file)) {
-+		    	g_free (file);
-+		    	return NULL;
-+		     }
- 		  }
- 		}
- 		else
diff --git a/x11-fm/file_menu_applet/files/patch-ac b/x11-fm/file_menu_applet/files/patch-ac
deleted file mode 100644
index 604f753c535d..000000000000
--- a/x11-fm/file_menu_applet/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/main.c.orig	Wed Mar 27 06:06:21 2002
-+++ src/main.c	Mon May  6 18:35:11 2002
-@@ -213,7 +213,7 @@
- 
- 	gnome_vfs_file_info_unref (dir_info);
- 
--	if (!fma->icon_menus) {
-+	if (fma->icon_menus) {
- 		result = gnome_vfs_directory_visit 
- 			(rp, (GNOME_VFS_FILE_INFO_FOLLOW_LINKS
- 				| GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE),
-@@ -400,6 +400,10 @@
- 	
- 	if (!fma->menu_label)
- 		fma->menu_label = strdup ("Home Directory");
-+	if (!fma->dir_watch)
-+		fma->menu_label = strdup ("~/");
-+	if (!fma->menu_label)
-+		fma->icon_menus = strdup ("true");
- 
- 	/* Create */
- 	fma->menu_bar = gtk_menu_bar_new ();
diff --git a/x11-fm/file_menu_applet/files/patch-src::flist-mime-icon.c b/x11-fm/file_menu_applet/files/patch-src::flist-mime-icon.c
new file mode 100644
index 000000000000..b5c7a9a837c7
--- /dev/null
+++ b/x11-fm/file_menu_applet/files/patch-src::flist-mime-icon.c
@@ -0,0 +1,41 @@
+--- src/flist-mime-icon.c.orig	Wed May 29 03:31:00 2002
++++ src/flist-mime-icon.c	Fri Jun 14 21:24:00 2002
+@@ -132,7 +132,7 @@
+ const char *
+ flist_mime_get_icon (const char *mime_type)
+ {
+-  gchar *mime_part, *index, *icon_name, *icon_name2;
++  gchar *mime_part, *index, *icon_name, *icon_name2, *icon_name3;
+ 
+   if (!mime_type)
+     goto skip_theme_stuff;
+@@ -170,6 +170,19 @@
+   
+  skip_theme_stuff:
+   
++  mime_part = g_strdup (mime_type);
++  index = strchr (mime_part, '/');
++  *index = '-';
++
++  icon_name3 = g_strconcat (MIMEICONDIR, "document-icons/gnome-", mime_part, ".png", NULL);
++
++  g_free(mime_part);
++
++  if (g_file_exists (icon_name3))
++    return icon_name3;
++    
++  g_free (icon_name3);
++
+   return gnome_vfs_mime_get_icon (mime_type);
+ }
+ 
+@@ -218,6 +231,9 @@
+ 	if (!file) {
+ 	  if (!icon) return NULL;
+ 	  flist_nautilus_theme_load ();
++
++          if (!strstr(icon, ".png"))
++             icon = g_strconcat(icon, ".png", NULL);
+ 
+ 	  if (!g_file_exists (icon)) {
+ 	    if (nautilus_theme_dir) file = g_concat_dir_and_file (nautilus_theme_dir, icon);
diff --git a/x11-fm/file_menu_applet/files/patch-src::main.c b/x11-fm/file_menu_applet/files/patch-src::main.c
new file mode 100644
index 000000000000..d1309e3979b6
--- /dev/null
+++ b/x11-fm/file_menu_applet/files/patch-src::main.c
@@ -0,0 +1,29 @@
+--- src/main.c.orig	Thu May 30 22:31:15 2002
++++ src/main.c	Fri Jun 14 23:13:34 2002
+@@ -318,13 +318,12 @@
+ 	g_timer_start (dm->timer);
+ 	g_timer_elapsed (dm->timer, &dm->last_time);
+ 
+-	if (fma->icon_menus) {
++	if (!fma->icon_menus) {
+ 		options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS
+-			| GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE
+ 			| GNOME_VFS_FILE_INFO_GET_MIME_TYPE;
+ 	} else {
+ 		options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS
+-			| GNOME_VFS_FILE_INFO_GET_MIME_TYPE;
++			| GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE;
+ 	}
+ 
+ 	result = gnome_vfs_directory_visit 
+@@ -559,6 +558,10 @@
+ 
+ 	if (!fma->menu_label)
+ 		fma->menu_label = strdup ("Home Directory");
++	if (!fma->dir_watch)
++		fma->dir_watch  = strdup ("~/");
++	if (fma->icon_menus == "(null)")
++		fma->icon_menus = strdup ("true");
+ 
+ 	/* Create */
+ 	fma->menu_bar = gtk_menu_bar_new ();