gnome-panel r10803 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Sun Feb 10 23:05:10 2008
New Revision: 10803
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10803&view=rev

Log:
2008-02-11  Vincent Untz  <vuntz gnome org>

	* panel.c: (drop_uri): finish gio port


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel.c

Modified: trunk/gnome-panel/panel.c
==============================================================================
--- trunk/gnome-panel/panel.c	(original)
+++ trunk/gnome-panel/panel.c	Sun Feb 10 23:05:10 2008
@@ -19,9 +19,6 @@
 #include <gio/gio.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgnomeui/gnome-icon-lookup.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 #include "panel.h"
 
 #include "applet.h"
@@ -517,6 +514,7 @@
 	char  *comment;
 	char  *buf;
 	char  *icon;
+	GFile *file;
 
 	if (!panel_profile_id_lists_are_writable ())
 		return FALSE;
@@ -526,7 +524,9 @@
 	if (!icon)
 		icon = g_strdup (fallback_icon);
 
-	buf = gnome_vfs_unescape_string_for_display (uri);
+	file = g_file_new_for_uri (uri);
+	buf = g_file_get_parse_name (file);
+	g_object_unref (file);
 	/* Translators: %s is a URI */
 	comment = g_strdup_printf (_("Open '%s'"), buf);
 	g_free (buf);