Move icon-loader and provide a temporary fallback to render pixbuf

9 files changed, 9 insertions, 9 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 8933c2672..ef17eeed9 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -18,7 +18,7 @@
 #include "button.h"
 #include "helper/action-context.h"
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "shortcuts.h"
 #include "ui/interface.h"
 
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 155f33389..a76f9024c 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -51,7 +51,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdkmm/display.h>
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/widget/ink-spinscale.h"
 #include "widgets/ege-adjustment-action.h"
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 85c4214a7..e35424430 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -31,7 +31,7 @@
 #include "style.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "ui/icon-names.h"
 
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index c879f2c11..b80463bbd 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -8,7 +8,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 #include "ink-action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include <gtk/gtk.h>
 
 static void ink_action_finalize( GObject* obj );
diff --git a/src/widgets/ink-radio-action.cpp b/src/widgets/ink-radio-action.cpp
index fb117594a..693c0d7b0 100644
--- a/src/widgets/ink-radio-action.cpp
+++ b/src/widgets/ink-radio-action.cpp
@@ -8,7 +8,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 #include "ink-radio-action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 static void ink_radio_action_finalize( GObject* obj );
 static void ink_radio_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp
index f7dc36450..3978dbd35 100644
--- a/src/widgets/ink-toggle-action.cpp
+++ b/src/widgets/ink-toggle-action.cpp
@@ -8,7 +8,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 #include "ink-toggle-action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 static void ink_toggle_action_finalize( GObject* obj );
 static void ink_toggle_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index b3e4c302d..24422c137 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -28,7 +28,7 @@
 #include "paint-selector.h"
 #include "path-prefix.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "helper/stock-items.h"
 
 #include "style.h"
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index f563e2352..0d25aa253 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -22,7 +22,7 @@
 #include "path-prefix.h"
 #include "stroke-style.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "helper/stock-items.h"
 
 #include "io/sys.h"
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 380a51c33..21e8068af 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -29,7 +29,7 @@
 
 #include "svg/svg-color.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/unit-menu.h"
 
 #include "widgets/style-utils.h"