Commit 12395ef0 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin
Browse files

sync with latest libegg.

2004-08-17  Mark McLoughlin  <mark@skynet.ie>

        * cut-n-paste-code/libegg/egg-recent-item.c: sync with latest
        libegg.
parent e4206dc1
2004-08-17 Mark McLoughlin <mark@skynet.ie>
* cut-n-paste-code/libegg/egg-recent-item.c: sync with latest
libegg.
2004-08-17 Alexander Larsson <alexl@redhat.com> 2004-08-17 Alexander Larsson <alexl@redhat.com>
   
* src/file-manager/fm-directory-view.c (fm_directory_view_launch_application): * src/file-manager/fm-directory-view.c (fm_directory_view_launch_application):
......
...@@ -300,7 +300,8 @@ egg_recent_item_get_short_name (const EggRecentItem *item) ...@@ -300,7 +300,8 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
return NULL; return NULL;
uri = gnome_vfs_uri_new (item->uri); uri = gnome_vfs_uri_new (item->uri);
g_assert (uri != NULL); /* We already checked this in egg_recent_item_set_uri() */ if (uri == NULL)
return NULL;
short_name = gnome_vfs_uri_extract_short_name (uri); short_name = gnome_vfs_uri_extract_short_name (uri);
valid = FALSE; valid = FALSE;
...@@ -325,7 +326,7 @@ egg_recent_item_get_short_name (const EggRecentItem *item) ...@@ -325,7 +326,7 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
short_name = tmp; short_name = tmp;
} }
g_free (uri); gnome_vfs_uri_unref (uri);
return short_name; return short_name;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment