Re: [Nautilus-list] continued redhat merge

[Frederic Crozat <fcrozat mandrakesoft com>]

On jeu, 2001-09-13 at 00:45, Alex Larsson wrote:
> Ok. To continue the merge from the redhat branch i've moved the main part 
> of the outstanding patches to cvs HEAD and branched it.
> 
> To see the full diff, do:
> cvs diff -n -r REDHAT_MERGE_BRANCHPOINT -r redhat-merge-branch nautilus
> 
> There seem to be some sort of problem with top-left text right now. mjs 
> will take a look at it.
> 
> This patch is a lot more raw than the previous... Let the reviewing begin!

I just found a problem when in
nautilus-link-impl-desktop.c#nautilus_link_impl_desktop_get_link_uri_from_desktop (DesktopFile *desktop_file) :

if .desktop file is from URL type, it is not correctly recognize..

We must add :
---
nautilus-1.0.4/libnautilus-private/nautilus-link-impl-desktop.c.orig	
Fri Sep 14 22:58:24 2001
+++ nautilus-1.0.4/libnautilus-private/nautilus-link-impl-desktop.c	Mon
Sep 17 17:03:04 2001
@@ -341,7 +341,13 @@
 			retval = g_strconcat ("command:", launch_string, NULL);
 		}
 		g_free (launch_string);
-	} else if ((strcmp (type, NAUTILUS_LINK_GENERIC_TAG) == 0) ||
+	} else if (strcmp (type, "URL") == 0) {		
+		desktop_file_get_string (desktop_file,
+					 "Desktop Entry",
+					 "Exec",
+					 &retval);
+	}
+	else if ((strcmp (type, NAUTILUS_LINK_GENERIC_TAG) == 0) ||
 		   (strcmp (type, NAUTILUS_LINK_MOUNT_TAG) == 0) ||
 		   (strcmp (type, NAUTILUS_LINK_TRASH_TAG) == 0) ||
 		   (strcmp (type, NAUTILUS_LINK_HOME_TAG) == 0)) {


-- 
Frédéric Crozat
MandrakeSoft