From 6763f013dc2510ad06df1e02fff2d1dfeb9e57f3 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 9 Sep 2014 15:44:46 -0700
Subject: file: consolidate some code

---
 libnautilus-private/nautilus-file.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 18d283994..c466ff92e 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4015,6 +4015,24 @@ get_custom_icon (NautilusFile *file)
 	return icon;
 }
 
+static GIcon *
+get_custom_or_link_icon (NautilusFile *file)
+{
+	GIcon *icon;
+
+	icon = get_custom_icon (file);
+	if (icon != NULL) {
+		return icon;
+	}
+
+	icon = get_link_icon (file);
+	if (icon != NULL) {
+		return icon;
+	}
+
+	return NULL;
+}
+
 static GIcon *
 get_default_file_icon (void)
 {
@@ -4315,20 +4333,11 @@ nautilus_file_get_gicon (NautilusFile *file,
 	int i;
 	gboolean is_folder = FALSE, is_inode_directory = FALSE;
 
-	icon = NULL;
-
 	if (file == NULL) {
 		return NULL;
 	}
 
-	icon = get_custom_icon (file);
-
-	if (icon != NULL) {
-		return icon;
-	}
-
-	icon = get_link_icon (file);
-
+	icon = get_custom_or_link_icon (file);
 	if (icon != NULL) {
 		return icon;
 	}
@@ -4544,12 +4553,7 @@ nautilus_file_get_icon (NautilusFile *file,
 		goto out;
 	}
 
-	gicon = get_custom_icon (file);
-
-	if (gicon == NULL) {
-		gicon = get_link_icon (file);
-	}
-
+	gicon = get_custom_or_link_icon (file);
 	if (gicon != NULL) {
 		icon = nautilus_icon_info_lookup (gicon, size, scale);
 		g_object_unref (gicon);
-- 
cgit v1.2.1