summaryrefslogtreecommitdiff
path: root/cut-n-paste-code/libegg
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-08-17 15:35:46 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-08-17 15:35:46 +0000
commit12395ef0ecc8fc9d28211069987c14ea54e004c0 (patch)
tree84edb2151002781b5b93133dbaf412a5d5eb0d8b /cut-n-paste-code/libegg
parente4206dc192280edfedbb7b25e0b7acbf44c3ea4e (diff)
downloadnautilus-12395ef0ecc8fc9d28211069987c14ea54e004c0.tar.gz
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.
Diffstat (limited to 'cut-n-paste-code/libegg')
-rw-r--r--cut-n-paste-code/libegg/egg-recent-item.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cut-n-paste-code/libegg/egg-recent-item.c b/cut-n-paste-code/libegg/egg-recent-item.c
index e61c1f816..9be7970ec 100644
--- a/cut-n-paste-code/libegg/egg-recent-item.c
+++ b/cut-n-paste-code/libegg/egg-recent-item.c
@@ -300,7 +300,8 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
return NULL;
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);
valid = FALSE;
@@ -325,7 +326,7 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
short_name = tmp;
}
- g_free (uri);
+ gnome_vfs_uri_unref (uri);
return short_name;
}