[the-board] [icons] Move all icons to proper hicolor theme directory

[Lucas Almeida Rocha <lucasr src gnome org>]

commit f323f27d0b67db2276174299f088ba0a22ecf41b
Author: Lucas Rocha <lucasr gnome org>
Date:   Sat Nov 13 23:57:09 2010 +0000

    [icons] Move all icons to proper hicolor theme directory

 data/icons/16x16/apps/the-board.png                |  Bin 305 -> 0 bytes
 data/icons/24x24/apps/the-board.png                |  Bin 308 -> 0 bytes
 data/icons/Makefile.am                             |   45 ++++++++++----------
 data/icons/{ => hicolor}/16x16/actions/less.png    |  Bin 423 -> 423 bytes
 data/icons/{ => hicolor}/16x16/actions/more.png    |  Bin 500 -> 500 bytes
 data/icons/{ => hicolor}/16x16/actions/ok.png      |  Bin 1196 -> 1196 bytes
 data/icons/hicolor/16x16/apps/the-board.png        |  Bin 0 -> 353 bytes
 data/icons/hicolor/22x22/apps/the-board.png        |  Bin 0 -> 370 bytes
 data/icons/{ => hicolor}/24x24/actions/less.png    |  Bin 416 -> 416 bytes
 data/icons/{ => hicolor}/24x24/actions/more.png    |  Bin 440 -> 440 bytes
 data/icons/{ => hicolor}/24x24/actions/ok.png      |  Bin 410 -> 410 bytes
 .../{ => hicolor}/24x24/actions/page-remove.png    |  Bin 432 -> 432 bytes
 data/icons/{ => hicolor}/24x24/actions/pause.png   |  Bin 200 -> 200 bytes
 data/icons/{ => hicolor}/24x24/actions/play.png    |  Bin 505 -> 505 bytes
 .../{ => hicolor}/24x24/actions/thing-remove.png   |  Bin 879 -> 879 bytes
 .../{ => hicolor}/24x24/actions/thing-resize.png   |  Bin 900 -> 900 bytes
 data/icons/hicolor/24x24/apps/the-board.png        |  Bin 0 -> 389 bytes
 data/icons/index.theme                             |    4 --
 src/js/ui/main.js                                  |    1 -
 src/js/util/path.js.in                             |    4 +-
 20 files changed, 25 insertions(+), 29 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c94acb5..c3c47b7 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,33 +1,34 @@
-iconsdir = $(pkgdatadir)/icons
+actioniconsdir = $(pkgdatadir)/icons/hicolor
+appsiconsdir = $(datadir)/icons/hicolor
 
-dist_icons_DATA = \
-    index.theme
+icons22x22appsdir = $(appsiconsdir)/22x22/apps
 
-icons24x24dir = $(iconsdir)/24x24
-icons24x24actionsdir = $(icons24x24dir)/actions
-icons24x24appsdir = $(icons24x24dir)/apps
+dist_icons22x22apps_DATA = \
+    hicolor/22x22/apps/the-board.png
+
+icons24x24actionsdir = $(actioniconsdir)/24x24/actions
+icons24x24appsdir = $(appsiconsdir)/24x24/apps
 
 dist_icons24x24actions_DATA = \
-    24x24/actions/less.png \
-    24x24/actions/more.png \
-    24x24/actions/ok.png \
-    24x24/actions/page-remove.png \
-    24x24/actions/pause.png \
-    24x24/actions/play.png \
-    24x24/actions/thing-remove.png \
-    24x24/actions/thing-resize.png
+    hicolor/24x24/actions/less.png \
+    hicolor/24x24/actions/more.png \
+    hicolor/24x24/actions/ok.png \
+    hicolor/24x24/actions/page-remove.png \
+    hicolor/24x24/actions/pause.png \
+    hicolor/24x24/actions/play.png \
+    hicolor/24x24/actions/thing-remove.png \
+    hicolor/24x24/actions/thing-resize.png
 
 dist_icons24x24apps_DATA = \
-    24x24/apps/the-board.png
+    hicolor/24x24/apps/the-board.png
 
-icons16x16dir = $(iconsdir)/16x16
-icons16x16actionsdir = $(icons16x16dir)/actions
-icons16x16appsdir = $(icons16x16dir)/apps
+icons16x16actionsdir = $(actioniconsdir)/16x16/actions
+icons16x16appsdir = $(appsiconsdir)/16x16/apps
 
 dist_icons16x16actions_DATA = \
-    16x16/actions/less.png \
-    16x16/actions/more.png \
-    16x16/actions/ok.png
+    hicolor/16x16/actions/less.png \
+    hicolor/16x16/actions/more.png \
+    hicolor/16x16/actions/ok.png
 
 dist_icons16x16apps_DATA = \
-    16x16/apps/the-board.png
+    hicolor/16x16/apps/the-board.png
diff --git a/data/icons/16x16/actions/less.png b/data/icons/hicolor/16x16/actions/less.png
similarity index 100%
rename from data/icons/16x16/actions/less.png
rename to data/icons/hicolor/16x16/actions/less.png
diff --git a/data/icons/16x16/actions/more.png b/data/icons/hicolor/16x16/actions/more.png
similarity index 100%
rename from data/icons/16x16/actions/more.png
rename to data/icons/hicolor/16x16/actions/more.png
diff --git a/data/icons/16x16/actions/ok.png b/data/icons/hicolor/16x16/actions/ok.png
similarity index 100%
rename from data/icons/16x16/actions/ok.png
rename to data/icons/hicolor/16x16/actions/ok.png
diff --git a/data/icons/hicolor/16x16/apps/the-board.png b/data/icons/hicolor/16x16/apps/the-board.png
new file mode 100644
index 0000000..265231f
Binary files /dev/null and b/data/icons/hicolor/16x16/apps/the-board.png differ
diff --git a/data/icons/hicolor/22x22/apps/the-board.png b/data/icons/hicolor/22x22/apps/the-board.png
new file mode 100644
index 0000000..21f3333
Binary files /dev/null and b/data/icons/hicolor/22x22/apps/the-board.png differ
diff --git a/data/icons/24x24/actions/less.png b/data/icons/hicolor/24x24/actions/less.png
similarity index 100%
rename from data/icons/24x24/actions/less.png
rename to data/icons/hicolor/24x24/actions/less.png
diff --git a/data/icons/24x24/actions/more.png b/data/icons/hicolor/24x24/actions/more.png
similarity index 100%
rename from data/icons/24x24/actions/more.png
rename to data/icons/hicolor/24x24/actions/more.png
diff --git a/data/icons/24x24/actions/ok.png b/data/icons/hicolor/24x24/actions/ok.png
similarity index 100%
rename from data/icons/24x24/actions/ok.png
rename to data/icons/hicolor/24x24/actions/ok.png
diff --git a/data/icons/24x24/actions/page-remove.png b/data/icons/hicolor/24x24/actions/page-remove.png
similarity index 100%
rename from data/icons/24x24/actions/page-remove.png
rename to data/icons/hicolor/24x24/actions/page-remove.png
diff --git a/data/icons/24x24/actions/pause.png b/data/icons/hicolor/24x24/actions/pause.png
similarity index 100%
rename from data/icons/24x24/actions/pause.png
rename to data/icons/hicolor/24x24/actions/pause.png
diff --git a/data/icons/24x24/actions/play.png b/data/icons/hicolor/24x24/actions/play.png
similarity index 100%
rename from data/icons/24x24/actions/play.png
rename to data/icons/hicolor/24x24/actions/play.png
diff --git a/data/icons/24x24/actions/thing-remove.png b/data/icons/hicolor/24x24/actions/thing-remove.png
similarity index 100%
rename from data/icons/24x24/actions/thing-remove.png
rename to data/icons/hicolor/24x24/actions/thing-remove.png
diff --git a/data/icons/24x24/actions/thing-resize.png b/data/icons/hicolor/24x24/actions/thing-resize.png
similarity index 100%
rename from data/icons/24x24/actions/thing-resize.png
rename to data/icons/hicolor/24x24/actions/thing-resize.png
diff --git a/data/icons/hicolor/24x24/apps/the-board.png b/data/icons/hicolor/24x24/apps/the-board.png
new file mode 100644
index 0000000..90dc630
Binary files /dev/null and b/data/icons/hicolor/24x24/apps/the-board.png differ
diff --git a/src/js/ui/main.js b/src/js/ui/main.js
index eb686df..7edf679 100644
--- a/src/js/ui/main.js
+++ b/src/js/ui/main.js
@@ -17,7 +17,6 @@ let _mainWindow = null;
 function onActivate(application) {
     let mxIcontheme = Mx.IconTheme.get_default();
     mxIcontheme.set_search_paths([Path.ICONS_DIR]);
-    mxIcontheme.set_theme_name('icons');
 
     let style = Mx.Style.get_default();
     style.load_from_file(Path.STYLE_DIR + "style.css");
diff --git a/src/js/util/path.js.in b/src/js/util/path.js.in
index fc0bb3a..c1437d8 100644
--- a/src/js/util/path.js.in
+++ b/src/js/util/path.js.in
@@ -10,9 +10,9 @@ if (_uninstalledDir) {
     BACKGROUNDS_DATA_DIR = _uninstalledDir + "/data/backgrounds/";
 }
 
-let ICONS_DIR = "@pkgdatadir@/";
+let ICONS_DIR = "@pkgdatadir@/icons/";
 if (_uninstalledDir) {
-    ICONS_DIR = _uninstalledDir + "/data/";
+    ICONS_DIR = _uninstalledDir + "/data/icons/";
 }
 
 let STYLE_DIR = "@pkgdatadir@/style/";