[nautilus] file: change mount emblem flag into a generic emblems flag

[Cosimo Cecchi <cosimoc src gnome org>]

commit 150cfb7a325e7b3668cf4c386a043593a8361ce0
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Sep 7 21:20:36 2014 -0700

    file: change mount emblem flag into a generic emblems flag
    
    We're going to use it later.

 libnautilus-private/nautilus-file.c  |    6 +++---
 libnautilus-private/nautilus-file.h  |    4 ++--
 src/nautilus-canvas-view-container.c |    2 +-
 src/nautilus-list-model.c            |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 1052dba..a2f2a6a 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4120,7 +4120,7 @@ nautilus_file_get_gicon (NautilusFile *file,
 
                /* fetch the mount icon here, we'll use it later */
                if (flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON ||
-                   flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM) {
+                   flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS) {
                        mount = nautilus_file_get_mount (file);
 
                        if (mount != NULL) {
@@ -4133,7 +4133,7 @@ nautilus_file_get_gicon (NautilusFile *file,
                     (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT) ||
                     (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_OPEN_FOLDER) ||
                     (flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON) ||
-                    (flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM) ||
+                    (flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS) ||
                     ((flags & NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING) == 0 &&
                      nautilus_file_has_open_window (file))) &&
                    G_IS_THEMED_ICON (file->details->icon)) {
@@ -4196,7 +4196,7 @@ nautilus_file_get_gicon (NautilusFile *file,
                    mount_icon != NULL) {
                        g_object_unref (icon);
                        icon = mount_icon;
-               } else if ((flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM) &&
+               } else if ((flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS) &&
                             mount_icon != NULL && !g_icon_equal (mount_icon, icon)) {
 
                        emblem = g_emblem_new (mount_icon);
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index 90294f0..ce89f50 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -79,8 +79,8 @@ typedef enum {
        NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE = (1<<5),
        /* uses the icon of the mount if present */
        NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON = (1<<6),
-       /* render the mount icon as an emblem over the regular one */
-       NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM = (1<<7)
+       /* render emblems */
+       NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS = (1<<7)
 } NautilusFileIconFlags;       
 
 /* Emblems sometimes displayed for NautilusFiles. Do not localize. */ 
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index e820295..e8a6efd 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -72,7 +72,7 @@ nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *contain
        
        *has_window_open = nautilus_file_has_open_window (file);
 
-       flags = NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM |
+       flags = NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS |
                NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS;
 
        if (for_drag_accept) {
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index 925683f..bf4b120 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -303,7 +303,7 @@ nautilus_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int
 
                        flags = NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS |
                                NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE |
-                               NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM;
+                               NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS;
                        if (model->details->drag_view != NULL) {
                                GtkTreePath *path_a, *path_b;