summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-02-02 14:00:26 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-02-02 14:00:26 +0000
commit1fba8da746c10aeea6997ff3860a4b6afd9d894d (patch)
tree0dd33a03a2d34a7b0b6b4666f8c4e908947ef5af
parentc2d22ada78c264dc3fe7c5eb10a9c714810783a3 (diff)
downloadnautilus-1fba8da746c10aeea6997ff3860a4b6afd9d894d.tar.gz
Fix crasher (#403565) Patch from Padraig O'Briain
2007-02-02 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-desktop-icon-file.c: Fix crasher (#403565) Patch from Padraig O'Briain svn path=/trunk/; revision=12715
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-private/nautilus-desktop-icon-file.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 83ec8bf6b..7b01f1405 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-02 Alexander Larsson <alexl@redhat.com>
+
+ * libnautilus-private/nautilus-desktop-icon-file.c:
+ Fix crasher (#403565)
+ Patch from Padraig O'Briain
+
2007-01-31 Alexander Larsson <alexl@redhat.com>
* src/nautilus-application.c (nautilus_application_present_spatial_window_with_selection):
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c
index 6886e9c2e..733be4122 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
+++ b/libnautilus-private/nautilus-desktop-icon-file.c
@@ -321,7 +321,10 @@ nautilus_desktop_icon_file_new (NautilusDesktopLink *link)
NautilusDesktopLink *
nautilus_desktop_icon_file_get_link (NautilusDesktopIconFile *icon_file)
{
- return g_object_ref (icon_file->details->link);
+ if (icon_file->details->link)
+ return g_object_ref (icon_file->details->link);
+ else
+ return NULL;
}
static void