[nautilus] Don't trust .desktop files in .gnome2



commit 5c17044597c980bdbe77a4894d92150fbe69909c
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Apr 25 20:03:38 2012 -0400

    Don't trust .desktop files in .gnome2
    
    gnome-panel no longer stores files there.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646584

 libnautilus-private/nautilus-file-utilities.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 92ccef3..45e2dba 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -1079,14 +1079,13 @@ nautilus_uninhibit_power_manager (gint cookie)
 	g_variant_unref (result);
 }
 
-/* Returns TRUE if the file is in XDG_DATA_DIRS or
-   in "~/.gnome2/". This is used for deciding
-   if a desktop file is "trusted" based on the path */
+/* Returns TRUE if the file is in XDG_DATA_DIRS. This is used for
+   deciding if a desktop file is "trusted" based on the path */
 gboolean
 nautilus_is_in_system_dir (GFile *file)
 {
 	const char * const * data_dirs; 
-	char *path, *gnome2;
+	char *path;
 	int i;
 	gboolean res;
 	
@@ -1107,16 +1106,6 @@ nautilus_is_in_system_dir (GFile *file)
 		
 	}
 
-	if (!res) {
-		/* Panel desktop files are here, trust them */
-		gnome2 = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
-		if (g_str_has_prefix (path, gnome2)) {
-			res = TRUE;
-		}
-		g_free (gnome2);
-	}
-	g_free (path);
-	
 	return res;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]