AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

Return the URI of the GtkRecentInfo object (upgraded to UTF-8 if needed)

Browse Source 
2006-11-16  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentmanager.c:
	(gtk_recent_info_get_uri_display): Return the URI
	of the GtkRecentInfo object (upgraded to UTF-8 if
	needed) in case of non-local file. (#351945)
This commit is contained in:
Emmanuele Bassi 2006-11-16 11:12:12 +00:00 committed by Emmanuele Bassi
parent ade821a03e
commit af6b361d6b
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-11-16 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c:
(gtk_recent_info_get_uri_display): Return the URI
of the GtkRecentInfo object (upgraded to UTF-8 if
needed) in case of non-local file. (#351945)
2006-11-16 Emmanuele Bassi <ebassi@gnome.org> 2006-11-16 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchoosermenu.c: * gtk/gtkrecentchoosermenu.c:

32
gtk/gtkrecentmanager.c
View File

@ -2295,7 +2295,9 @@ gtk_recent_info_get_short_name (GtkRecentInfo *info)
* gtk_recent_info_get_uri_display: * gtk_recent_info_get_uri_display:
* @info: a #GtkRecentInfo * @info: a #GtkRecentInfo
* *
* Gets a displayable version of the resource's URI. * Gets a displayable version of the resource's URI. If the resource
* is local, it returns a local path; if the resource is not local,
* it returns the UTF-8 encoded content of gtk_recent_info_get_uri().
* *
* Return value: a UTF-8 string containing the resource's URI or %NULL * Return value: a UTF-8 string containing the resource's URI or %NULL
* *
@ -2304,18 +2306,28 @@ gtk_recent_info_get_short_name (GtkRecentInfo *info)
gchar * gchar *
gtk_recent_info_get_uri_display (GtkRecentInfo *info) gtk_recent_info_get_uri_display (GtkRecentInfo *info)
{ {
gchar *filename, *filename_utf8; gchar *retval;
g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (info != NULL, NULL);
filename = g_filename_from_uri (info->uri, NULL, NULL);
if (!filename)
return NULL;
filename_utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
g_free (filename);
return filename_utf8; retval = NULL;
if (gtk_recent_info_is_local (info))
{
gchar *filename;
filename = g_filename_from_uri (info->uri, NULL, NULL);
if (!filename)
return NULL;
retval = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
g_free (filename);
}
else
{
retval = make_valid_utf8 (info->uri);
}
return retval;
} }
/** /**