[gnome-panel] panel: Don't create launchers on DnD using nautilus desktop files

[Vincent Untz <vuntz src gnome org>]

commit f4485defc7352d89a7a901b2b4ffcfe1a57dba42
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 11 18:11:31 2011 +0100

    panel: Don't create launchers on DnD using nautilus desktop files
    
    As they're going away for 3.0.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639234

 gnome-panel/panel.c |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)
---
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 4bcf2af..c0c5e8e 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -572,15 +572,42 @@ drop_nautilus_desktop_uri (PanelWidget *panel,
 	if (strncmp (basename, "trash", strlen ("trash")) == 0)
 		panel_applet_frame_create (panel->toplevel, pos,
 					   "OAFIID:GNOME_Panel_TrashApplet");
-	else if (strncmp (basename, "home", strlen ("home")) == 0)
-		panel_launcher_create_with_id (id, pos,
-					       "nautilus-home.desktop");
-	else if (strncmp (basename, "computer", strlen ("computer")) == 0)
-		panel_launcher_create_with_id (id, pos,
-					       "nautilus-computer.desktop");
+	else if (strncmp (basename, "home", strlen ("home")) == 0) {
+		char  *name;
+		char  *uri;
+		GFile *file;
+
+		file = g_file_new_for_path (g_get_home_dir ());
+		uri = g_file_get_uri (file);
+		name = panel_util_get_label_for_uri (uri);
+		g_free (uri);
+		g_object_unref (file);
+
+		panel_launcher_create_from_info (panel->toplevel,
+						 pos,
+						 TRUE, /* is_exec? */
+						 "nautilus --no-desktop", /* exec */
+						 name, /* name */
+						 _("Open your personal folder"), /* comment */
+						 PANEL_ICON_HOME); /* icon name */
+
+		g_free (name);
+	} else if (strncmp (basename, "computer", strlen ("computer")) == 0)
+		panel_launcher_create_from_info (panel->toplevel,
+						 pos,
+						 TRUE, /* is_exec? */
+						 "nautilus --no-desktop computer://", /* exec */
+						 _("Computer"), /* name */
+						 _("Browse all local and remote disks and folders accessible from this computer"), /* comment */
+						 PANEL_ICON_COMPUTER); /* icon name */
 	else if (strncmp (basename, "network", strlen ("network")) == 0)
-		panel_launcher_create_with_id (id, pos,
-					       "nautilus-scheme.desktop");
+		panel_launcher_create_from_info (panel->toplevel,
+						 pos,
+						 TRUE, /* is_exec? */
+						 "nautilus --no-desktop network://", /* exec */
+						 _("Network"), /* name */
+						 _("Browse bookmarked and local network locations"), /* comment */
+						 PANEL_ICON_NETWORK); /* icon name */
 	else
 		success = FALSE;