g_filename_from_uri() might fail; catch the failure and fall back to the

2006-11-21  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentmanager.c:
	(get_uri_shortname_for_display): g_filename_from_uri() might
	fail; catch the failure and fall back to the non-local URI
	case. (#363437)
This commit is contained in:
Emmanuele Bassi 2006-11-22 09:12:49 +00:00 committed by Emmanuele Bassi
parent 6b9ba0b654
commit bf68a296f8
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2006-11-21 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c:
(get_uri_shortname_for_display): g_filename_from_uri() might
fail; catch the failure and fall back to the non-local URI
case. (#363437)
2006-11-19 Mark McLoughlin <mark@skynet.ie>
Fixes bug #376502 - multi-screen support for GtkStatusIcon

View File

@ -2225,7 +2225,7 @@ get_uri_shortname_for_display (const gchar *uri)
local_file = g_filename_from_uri (uri, NULL, NULL);
if (local_file != NULL)
if (local_file)
{
name = g_filename_display_basename (local_file);
validated = TRUE;
@ -2233,7 +2233,8 @@ get_uri_shortname_for_display (const gchar *uri)
g_free (local_file);
}
else
if (!name)
{
gchar *method;
gchar *local_file;