From f53170c757581dd74f34d14c6e70e9a9cf614ff1 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sun, 22 May 2005 10:59:56 +0000
Subject: Sync

2005-05-22  Marco Pesenti Gritti  <mpg@redhat.com>

        * cut-n-paste/recent-files/egg-recent-item.c:
        (egg_recent_item_get_short_name):
        * cut-n-paste/toolbar-editor/Makefile.am:
        * cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
        (new_pixbuf_from_widget):
        * cut-n-paste/toolbar-editor/egg-editable-toolbar.h:
        * cut-n-paste/toolbar-editor/egg-marshal.c:
        * cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
        * cut-n-paste/toolbar-editor/egg-toolbars-model.c:

        Sync
---
(limited to 'cut-n-paste/recent-files')

diff --git a/cut-n-paste/recent-files/egg-recent-item.c b/cut-n-paste/recent-files/egg-recent-item.c
index 535e222..bf7fee6 100644
--- a/cut-n-paste/recent-files/egg-recent-item.c
+++ b/cut-n-paste/recent-files/egg-recent-item.c
@@ -316,6 +316,11 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
 		return NULL;
 
 	short_name = gnome_vfs_uri_extract_short_name (uri);
+	if (short_name == NULL) {
+		gnome_vfs_uri_unref (uri);
+		return NULL;
+	}
+
 	valid = FALSE;
 
 	if (strcmp (gnome_vfs_uri_get_scheme (uri), "file") == 0) {
--
cgit v0.9.1