GNOME.org
 

[gnome-photos] Use string literals, not preprocessor macros, for icon names

commit 4fadfd2fbc9de251cfff206e9cababb9875ae2c5
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Jan 18 16:39:05 2018 +0100

    Use string literals, not preprocessor macros, for icon names
    
    The macros can't be used in GtkBuilder UI definition files, which
    throws consistency out the window.
    
    Secondly, It's better to consider the icon names as APIs, just like
    functions and types. They aren't magic values, so having them behind a
    macro doesn't necessarily make them more meaningful. It just makes it
    marginally more difficult to find out the icon name being used by a
    certain piece of code.

 src/Makefile.am                    |  1 -
 src/photos-base-item.c             |  7 ++---
 src/photos-delete-notification.c   |  3 +-
 src/photos-dlna-renderers-dialog.c |  3 +-
 src/photos-done-notification.c     |  3 +-
 src/photos-empty-results-box.c     |  7 ++---
 src/photos-export-notification.c   |  3 +-
 src/photos-icons.h                 | 64 --------------------------------------
 src/photos-indexing-notification.c |  3 +-
 src/photos-main-toolbar.c          | 17 +++++-----
 src/photos-overview-searchbar.c    |  1 -
 src/photos-preview-nav-buttons.c   |  5 ++-
 src/photos-print-notification.c    |  3 +-
 src/photos-selection-toolbar.c     |  5 ++-
 src/photos-share-notification.c    |  3 +-
 src/photos-source-notification.c   |  3 +-
 src/photos-tool-colors.c           |  3 +-
 src/photos-tool-crop.c             |  5 ++-
 src/photos-tool-enhance.c          |  3 +-
 src/photos-tool-filter-button.c    |  5 ++-
 src/photos-tool-filters.c          |  3 +-
 21 files changed, 33 insertions(+), 117 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a65c2725..7561e1bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,7 +118,6 @@ gnome_photos_SOURCES = \
        photos-glib.h \
        photos-google-item.c \
        photos-google-item.h \
-       photos-icons.h \
        photos-image-view.c \
        photos-image-view.h \
        photos-image-view-helper.c \
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index cf2acbc6..139f9197 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -50,7 +50,6 @@
 #include "photos-filterable.h"
 #include "photos-gegl.h"
 #include "photos-glib.h"
-#include "photos-icons.h"
 #include "photos-local-item.h"
 #include "photos-pipeline.h"
 #include "photos-print-notification.h"
@@ -375,7 +374,7 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
 
   if (priv->favorite)
     {
-      pix = photos_base_item_create_symbolic_emblem (PHOTOS_ICON_FAVORITE, scale);
+      pix = photos_base_item_create_symbolic_emblem ("starred", scale);
       emblem_icons = g_list_prepend (emblem_icons, pix);
     }
 
@@ -800,7 +799,7 @@ static void
 photos_base_item_set_failed_icon (PhotosBaseItem *self)
 {
   if (failed_icon == NULL)
-    failed_icon = photos_base_item_create_placeholder_icon (PHOTOS_ICON_IMAGE_X_GENERIC_SYMBOLIC);
+    failed_icon = photos_base_item_create_placeholder_icon ("image-x-generic-symbolic");
 
   photos_base_item_set_original_icon (self, failed_icon);
 }
@@ -2554,7 +2553,7 @@ static void
 photos_base_item_set_thumbnailing_icon (PhotosBaseItem *self)
 {
   if (thumbnailing_icon == NULL)
-    thumbnailing_icon = photos_base_item_create_placeholder_icon (PHOTOS_ICON_CONTENT_LOADING_SYMBOLIC);
+    thumbnailing_icon = photos_base_item_create_placeholder_icon ("content-loading-symbolic");
 
   photos_base_item_set_original_icon (self, thumbnailing_icon);
 }
diff --git a/src/photos-delete-notification.c b/src/photos-delete-notification.c
index e7b6bccb..585000ad 100644
--- a/src/photos-delete-notification.c
+++ b/src/photos-delete-notification.c
@@ -26,7 +26,6 @@
 
 #include "photos-base-item.h"
 #include "photos-delete-notification.h"
-#include "photos-icons.h"
 #include "photos-item-manager.h"
 #include "photos-notification-manager.h"
 #include "photos-search-context.h"
@@ -151,7 +150,7 @@ photos_delete_notification_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (self), undo);
   g_signal_connect_swapped (undo, "clicked", G_CALLBACK (photos_delete_notification_undo_clicked), self);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-dlna-renderers-dialog.c b/src/photos-dlna-renderers-dialog.c
index be4002ab..fb01e00a 100644
--- a/src/photos-dlna-renderers-dialog.c
+++ b/src/photos-dlna-renderers-dialog.c
@@ -33,7 +33,6 @@
 #include "photos-dleyna-renderer-push-host.h"
 #include "photos-dlna-renderer.h"
 #include "photos-dlna-renderers-manager.h"
-#include "photos-icons.h"
 #include "photos-item-manager.h"
 #include "photos-local-item.h"
 #include "photos-remote-display-manager.h"
@@ -177,7 +176,7 @@ photos_dlna_renderers_dialog_add_renderer (PhotosDlnaRenderersDialog *self, Phot
 
   name = photos_dlna_renderer_get_friendly_name (renderer);
 
-  icon = g_themed_icon_new_with_default_fallbacks (PHOTOS_ICON_VIDEO_DISPLAY_SYMBOLIC);
+  icon = g_themed_icon_new_with_default_fallbacks ("video-display-symbolic");
   image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
 
   g_object_ref (image); /* keep a ref for the following async call and release it in the callback */
diff --git a/src/photos-done-notification.c b/src/photos-done-notification.c
index 729bfcc5..c7859b3e 100644
--- a/src/photos-done-notification.c
+++ b/src/photos-done-notification.c
@@ -26,7 +26,6 @@
 
 #include "photos-done-notification.h"
 #include "photos-filterable.h"
-#include "photos-icons.h"
 #include "photos-notification-manager.h"
 #include "photos-search-context.h"
 
@@ -135,7 +134,7 @@ photos_done_notification_constructed (GObject *object)
                            self,
                            G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-empty-results-box.c b/src/photos-empty-results-box.c
index 14c557af..87541982 100644
--- a/src/photos-empty-results-box.c
+++ b/src/photos-empty-results-box.c
@@ -30,7 +30,6 @@
 
 #include "photos-empty-results-box.h"
 #include "photos-enums.h"
-#include "photos-icons.h"
 #include "photos-search-context.h"
 #include "photos-source-manager.h"
 #include "photos-utils.h"
@@ -167,12 +166,12 @@ photos_empty_results_box_constructed (GObject *object)
   switch (self->mode)
     {
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_PHOTOS_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+      image = gtk_image_new_from_icon_name ("emblem-photos-symbolic", GTK_ICON_SIZE_INVALID);
       label = g_strconcat ("<b><span size=\"large\">", _("No Albums Found"), "</span></b>", NULL);
       break;
 
     case PHOTOS_WINDOW_MODE_FAVORITES:
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+      image = gtk_image_new_from_icon_name ("starred-symbolic", GTK_ICON_SIZE_INVALID);
       label = g_strconcat ("<b><span size=\"large\">", _("Starred photos will appear here"), "</span></b>", 
NULL);
       break;
 
@@ -182,7 +181,7 @@ photos_empty_results_box_constructed (GObject *object)
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_PHOTOS_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+      image = gtk_image_new_from_icon_name ("emblem-photos-symbolic", GTK_ICON_SIZE_INVALID);
       label = g_strconcat ("<b><span size=\"large\">", _("No Photos Found"), "</span></b>", NULL);
       break;
 
diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c
index ff57b55c..1b8baba3 100644
--- a/src/photos-export-notification.c
+++ b/src/photos-export-notification.c
@@ -28,7 +28,6 @@
 #include "photos-base-item.h"
 #include "photos-base-manager.h"
 #include "photos-export-notification.h"
-#include "photos-icons.h"
 #include "photos-notification-manager.h"
 #include "photos-utils.h"
 
@@ -324,7 +323,7 @@ photos_export_notification_constructed (GObject *object)
                                 self);
     }
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
index 344d7a87..c7f5418d 100644
--- a/src/photos-indexing-notification.c
+++ b/src/photos-indexing-notification.c
@@ -32,7 +32,6 @@
 
 #include "photos-application.h"
 #include "photos-gom-miner.h"
-#include "photos-icons.h"
 #include "photos-indexing-notification.h"
 #include "photos-notification-manager.h"
 
@@ -277,7 +276,7 @@ photos_indexing_notification_init (PhotosIndexingNotification *self)
   gtk_style_context_add_class (context, "dim-label");
   gtk_container_add (GTK_CONTAINER (labels), self->secondary_label);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index d174251a..bfa4ad0e 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -32,7 +32,6 @@
 
 #include "photos-dlna-renderers-manager.h"
 #include "photos-dropdown.h"
-#include "photos-icons.h"
 #include "photos-item-manager.h"
 #include "photos-main-toolbar.h"
 #include "photos-remote-display-manager.h"
@@ -177,7 +176,7 @@ photos_main_toolbar_add_back_button (PhotosMainToolbar *self)
 {
   GtkWidget *back_button;
 
-  back_button = gtk_button_new_from_icon_name (PHOTOS_ICON_GO_PREVIOUS_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  back_button = gtk_button_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_BUTTON);
   gtk_widget_set_tooltip_text (back_button, _("Back"));
   gtk_header_bar_pack_start (GTK_HEADER_BAR (self->header_bar), back_button);
   g_signal_connect_swapped (back_button, "clicked", G_CALLBACK (photos_main_toolbar_back_button_clicked), 
self);
@@ -265,7 +264,7 @@ photos_main_toolbar_add_search_button (PhotosMainToolbar *self)
   GtkWidget *image;
   GtkWidget *search_button;
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_EDIT_FIND_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_BUTTON);
   search_button = gtk_toggle_button_new ();
   gtk_widget_set_tooltip_text (search_button, _("Search"));
   gtk_button_set_image (GTK_BUTTON (search_button), image);
@@ -281,7 +280,7 @@ photos_main_toolbar_add_selection_button (PhotosMainToolbar *self)
 {
   GtkWidget *selection_button;
 
-  selection_button = gtk_button_new_from_icon_name (PHOTOS_ICON_OBJECT_SELECT_SYMBOLIC, 
GTK_ICON_SIZE_BUTTON);
+  selection_button = gtk_button_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_BUTTON);
   gtk_widget_set_tooltip_text (selection_button, _("Select Items"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (selection_button), "app.selection-mode");
   gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header_bar), selection_button);
@@ -376,12 +375,12 @@ photos_main_toolbar_favorite_button_update (PhotosMainToolbar *self, gboolean fa
   if (favorite)
     {
       favorite_label = g_strdup (_("Remove from favorites"));
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name ("starred-symbolic", GTK_ICON_SIZE_BUTTON);
     }
   else
     {
       favorite_label = g_strdup (_("Add to favorites"));
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_NOT_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name ("non-starred-symbolic", GTK_ICON_SIZE_BUTTON);
     }
 
   gtk_button_set_image (GTK_BUTTON (self->favorite_button), image);
@@ -471,7 +470,7 @@ photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self)
   photos_main_toolbar_add_back_button (self);
 
   preview_menu = photos_main_toolbar_create_preview_menu (self);
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_SYSTEM_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name ("open-menu-symbolic", GTK_ICON_SIZE_BUTTON);
   menu_button = gtk_menu_button_new ();
   gtk_actionable_set_action_name (GTK_ACTIONABLE (menu_button), "app.gear-menu");
   gtk_button_set_image (GTK_BUTTON (menu_button), image);
@@ -480,11 +479,11 @@ photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self)
 
   g_simple_action_set_enabled (self->gear_menu, TRUE);
 
-  share_button = gtk_button_new_from_icon_name (PHOTOS_ICON_IMAGE_SHARE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  share_button = gtk_button_new_from_icon_name ("emblem-shared-symbolic", GTK_ICON_SIZE_BUTTON);
   gtk_actionable_set_action_name (GTK_ACTIONABLE (share_button), "app.share-current");
   gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header_bar), share_button);
 
-  edit_button = gtk_button_new_from_icon_name (PHOTOS_ICON_IMAGE_EDIT_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  edit_button = gtk_button_new_from_icon_name ("image-edit-symbolic", GTK_ICON_SIZE_BUTTON);
   gtk_actionable_set_action_name (GTK_ACTIONABLE (edit_button), "app.edit-current");
   gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header_bar), edit_button);
 
diff --git a/src/photos-overview-searchbar.c b/src/photos-overview-searchbar.c
index 3e647f3c..0bdb273c 100644
--- a/src/photos-overview-searchbar.c
+++ b/src/photos-overview-searchbar.c
@@ -32,7 +32,6 @@
 #include "photos-base-manager.h"
 #include "photos-dropdown.h"
 #include "photos-filterable.h"
-#include "photos-icons.h"
 #include "photos-overview-searchbar.h"
 #include "photos-search-context.h"
 #include "photos-search-controller.h"
diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c
index 2de745aa..c3e4997d 100644
--- a/src/photos-preview-nav-buttons.c
+++ b/src/photos-preview-nav-buttons.c
@@ -30,7 +30,6 @@
 
 #include "photos-base-manager.h"
 #include "photos-delete-notification.h"
-#include "photos-icons.h"
 #include "photos-preview-nav-buttons.h"
 #include "photos-search-context.h"
 #include "photos-zoom-controls.h"
@@ -472,7 +471,7 @@ photos_preview_nav_buttons_constructed (GObject *object)
   gtk_revealer_set_transition_type (GTK_REVEALER (self->prev_widget), 
GTK_REVEALER_TRANSITION_TYPE_CROSSFADE);
   gtk_overlay_add_overlay (GTK_OVERLAY (self->overlay), self->prev_widget);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_GO_PREVIOUS_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
 
   button = gtk_button_new ();
@@ -498,7 +497,7 @@ photos_preview_nav_buttons_constructed (GObject *object)
   gtk_revealer_set_transition_type (GTK_REVEALER (self->next_widget), 
GTK_REVEALER_TRANSITION_TYPE_CROSSFADE);
   gtk_overlay_add_overlay (GTK_OVERLAY (self->overlay), self->next_widget);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_GO_NEXT_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("go-next-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
 
   button = gtk_button_new ();
diff --git a/src/photos-print-notification.c b/src/photos-print-notification.c
index cf7bf84a..3556a063 100644
--- a/src/photos-print-notification.c
+++ b/src/photos-print-notification.c
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "photos-icons.h"
 #include "photos-print-notification.h"
 #include "photos-notification-manager.h"
 
@@ -153,7 +152,7 @@ photos_print_notification_init (PhotosPrintNotification *self)
   gtk_widget_set_hexpand (self->status_label, TRUE);
   gtk_container_add (GTK_CONTAINER (self), self->status_label);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_PROCESS_STOP_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("process-stop-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 921386a1..91da1447 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -32,7 +32,6 @@
 
 #include "photos-base-item.h"
 #include "photos-delete-notification.h"
-#include "photos-icons.h"
 #include "photos-item-manager.h"
 #include "photos-organize-collection-dialog.h"
 #include "photos-search-context.h"
@@ -248,12 +247,12 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
   if (show_favorite && fav_count == sel_length)
     {
       favorite_label = g_strdup (_("Remove from favorites"));
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name ("starred-symbolic", GTK_ICON_SIZE_BUTTON);
     }
   else
     {
       favorite_label = g_strdup (_("Add to favorites"));
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_NOT_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name ("non-starred-symbolic", GTK_ICON_SIZE_BUTTON);
     }
 
   gtk_button_set_image (GTK_BUTTON (self->toolbar_favorite), image);
diff --git a/src/photos-share-notification.c b/src/photos-share-notification.c
index 04b2efbb..56936797 100644
--- a/src/photos-share-notification.c
+++ b/src/photos-share-notification.c
@@ -25,7 +25,6 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include "photos-icons.h"
 #include "photos-notification-manager.h"
 #include "photos-share-notification.h"
 
@@ -174,7 +173,7 @@ photos_share_notification_constructed (GObject *object)
       g_signal_connect_swapped (open, "clicked", G_CALLBACK (photos_share_notification_open), self);
     }
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-source-notification.c b/src/photos-source-notification.c
index d1229819..4d628b2e 100644
--- a/src/photos-source-notification.c
+++ b/src/photos-source-notification.c
@@ -26,7 +26,6 @@
 #include <glib/gi18n.h>
 
 #include "photos-source-notification.h"
-#include "photos-icons.h"
 #include "photos-utils.h"
 
 
@@ -139,7 +138,7 @@ photos_source_notification_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (self), settings);
   g_signal_connect_swapped (settings, "clicked", G_CALLBACK (photos_source_notification_settings_clicked), 
self);
 
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_margin_bottom (image, 2);
   gtk_widget_set_margin_top (image, 2);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
diff --git a/src/photos-tool-colors.c b/src/photos-tool-colors.c
index 1a7644f2..1ce86014 100644
--- a/src/photos-tool-colors.c
+++ b/src/photos-tool-colors.c
@@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "photos-icons.h"
 #include "photos-tool.h"
 #include "photos-tool-colors.h"
 #include "photos-utils.h"
@@ -494,7 +493,7 @@ photos_tool_colors_class_init (PhotosToolColorsClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   PhotosToolClass *tool_class = PHOTOS_TOOL_CLASS (class);
 
-  tool_class->icon_name = PHOTOS_ICON_IMAGE_ADJUST_COLOR_SYMBOLIC;
+  tool_class->icon_name = "image-adjust-color-symbolic";
   tool_class->name = _("Colors");
 
   object_class->dispose = photos_tool_colors_dispose;
diff --git a/src/photos-tool-crop.c b/src/photos-tool-crop.c
index 5fc05290..893b0aa1 100644
--- a/src/photos-tool-crop.c
+++ b/src/photos-tool-crop.c
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 
 #include "egg-animation.h"
-#include "photos-icons.h"
 #include "photos-image-view.h"
 #include "photos-tool.h"
 #include "photos-tool-crop.h"
@@ -1507,7 +1506,7 @@ photos_tool_crop_init (PhotosToolCrop *self)
       label = gtk_label_new (_(self->constraints[i].name));
       gtk_container_add (GTK_CONTAINER (grid), label);
 
-      image = gtk_image_new_from_icon_name (PHOTOS_ICON_OBJECT_SELECT_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+      image = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_INVALID);
       gtk_widget_set_no_show_all (image, TRUE);
       gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
       gtk_container_add (GTK_CONTAINER (grid), image);
@@ -1572,7 +1571,7 @@ photos_tool_crop_class_init (PhotosToolCropClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   PhotosToolClass *tool_class = PHOTOS_TOOL_CLASS (class);
 
-  tool_class->icon_name = PHOTOS_ICON_IMAGE_CROP_SYMBOLIC;
+  tool_class->icon_name = "image-crop-symbolic";
   tool_class->name = _("Crop");
 
   object_class->dispose = photos_tool_crop_dispose;
diff --git a/src/photos-tool-enhance.c b/src/photos-tool-enhance.c
index 2b04139a..ca892b72 100644
--- a/src/photos-tool-enhance.c
+++ b/src/photos-tool-enhance.c
@@ -26,7 +26,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "photos-icons.h"
 #include "photos-tool.h"
 #include "photos-tool-enhance.h"
 #include "photos-utils.h"
@@ -244,7 +243,7 @@ photos_tool_enhance_class_init (PhotosToolEnhanceClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   PhotosToolClass *tool_class = PHOTOS_TOOL_CLASS (class);
 
-  tool_class->icon_name = PHOTOS_ICON_IMAGE_AUTO_ADJUST_SYMBOLIC;
+  tool_class->icon_name = "image-auto-adjust-symbolic";
   tool_class->name = _("Enhance");
 
   object_class->dispose = photos_tool_enhance_dispose;
diff --git a/src/photos-tool-filter-button.c b/src/photos-tool-filter-button.c
index 1807baa7..bf268fe0 100644
--- a/src/photos-tool-filter-button.c
+++ b/src/photos-tool-filter-button.c
@@ -26,7 +26,6 @@
 #include <gio/gio.h>
 
 #include "photos-application.h"
-#include "photos-icons.h"
 #include "photos-tool-filter-button.h"
 #include "photos-utils.h"
 #include "photos-widget-shader.h"
@@ -118,7 +117,7 @@ photos_tool_filter_button_constructed (GObject *object)
 
   app = g_application_get_default ();
   scale = photos_application_get_scale_factor (PHOTOS_APPLICATION (app));
-  preview_icon = photos_utils_create_placeholder_icon_for_scale (PHOTOS_ICON_CONTENT_LOADING_SYMBOLIC, 96, 
scale);
+  preview_icon = photos_utils_create_placeholder_icon_for_scale ("content-loading-symbolic", 96, scale);
   if (preview_icon != NULL)
     preview_icon_surface = gdk_cairo_surface_create_from_pixbuf (preview_icon, scale, NULL);
 
@@ -231,7 +230,7 @@ photos_tool_filter_button_init (PhotosToolFilterButton *self)
 {
   self->overlay = gtk_overlay_new ();
 
-  self->selected_image = gtk_image_new_from_icon_name (PHOTOS_ICON_OBJECT_SELECT_SYMBOLIC, 
GTK_ICON_SIZE_INVALID);
+  self->selected_image = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_widget_set_halign (self->selected_image, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (self->selected_image, GTK_ALIGN_CENTER);
   gtk_widget_set_no_show_all (self->selected_image, TRUE);
diff --git a/src/photos-tool-filters.c b/src/photos-tool-filters.c
index fb89e6b9..f19eb17a 100644
--- a/src/photos-tool-filters.c
+++ b/src/photos-tool-filters.c
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 
 #include "photos-application.h"
-#include "photos-icons.h"
 #include "photos-operation-insta-common.h"
 #include "photos-tool.h"
 #include "photos-tool-filter-button.h"
@@ -232,7 +231,7 @@ photos_tool_filters_class_init (PhotosToolFiltersClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   PhotosToolClass *tool_class = PHOTOS_TOOL_CLASS (class);
 
-  tool_class->icon_name = PHOTOS_ICON_IMAGE_FILTER_SYMBOLIC;
+  tool_class->icon_name = "image-filter-symbolic";
   tool_class->name = _("Filters");
 
   object_class->dispose = photos_tool_filters_dispose;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]