[nautilus] file: consolidate some code

[Cosimo Cecchi <cosimoc src gnome org>]

commit 6763f013dc2510ad06df1e02fff2d1dfeb9e57f3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Sep 9 15:44:46 2014 -0700

    file: consolidate some code

 libnautilus-private/nautilus-file.c |   36 +++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 18d2839..c466ff9 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4016,6 +4016,24 @@ get_custom_icon (NautilusFile *file)
 }
 
 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)
 {
        static GIcon *fallback_icon = NULL;
@@ -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);