[gnome-maps] Add icons to default icon theme

[Jonas Danielsson <jonasdn src gnome org>]

commit c3970a6c11ff933fa0470c9bc87846721d5efd1c
Author: Jonas Danielsson <jonas danielsson threetimestwo org>
Date:   Fri Sep 5 08:35:04 2014 -0400

    Add icons to default icon theme
    
    Add our icons in a correct manner in order to append
    our icon dir as search path to the default icon theme.
    
    This makes the code easier to parse and removes the
    warnings about symbolic-ltr.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736126

 data/icons/Makefile.am                             |   32 ++-
 ...hicolor_apps_16x16_maps-point-end-symbolic.svg} |    0
 ...d.svg => hicolor_apps_16x16_maps-point-end.svg} |    0
 ...color_apps_16x16_maps-point-start-symbolic.svg} |    0
 ...svg => hicolor_apps_16x16_maps-point-start.svg} |    0
 ...on.png => hicolor_apps_22x22_user-location.png} |  Bin 879 -> 879 bytes
 data/icons/pin.svg                                 |  336 --------------------
 src/path.js.in                                     |    2 +-
 src/searchResultMarker.js                          |    3 +-
 src/turnPointMarker.js                             |    3 +-
 src/userLocationMarker.js                          |    3 +-
 src/utils.js                                       |    7 +-
 12 files changed, 30 insertions(+), 356 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 3e540ed..8907c0d 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -20,14 +20,13 @@ public_icons =                                              \
        HighContrast_apps_48x48_gnome-maps.png          \
        $(NULL)
 
-imagesdir = $(datadir)/gnome-maps/pixmaps
-images_DATA =                                   \
-       maps-point-start.svg                    \
-       maps-point-end.svg                      \
-       maps-point-start-symbolic.svg           \
-       maps-point-end-symbolic.svg             \
-       pin.svg                                 \
-       user-location.png                       \
+private_icons =                                                        \
+       hicolor_apps_16x16_maps-point-start.svg                 \
+       hicolor_apps_16x16_maps-point-end.svg                   \
+       hicolor_apps_16x16_maps-point-start-symbolic.svg        \
+       hicolor_apps_16x16_maps-point-end-symbolic.svg          \
+       hicolor_apps_32x32_maps-pin.svg                         \
+       hicolor_apps_22x22_user-location.png                    \
        $(NULL)
 
 noinst_DATA =                                  \
@@ -37,7 +36,7 @@ noinst_DATA =                                 \
 
 EXTRA_DIST =                                   \
        $(public_icons)                         \
-       $(images_DATA)                          \
+       $(private_icons)                        \
        gnome-maps.svg                          \
        gnome-maps-highcontrast.svg                             \
        $(NULL)
@@ -68,6 +67,14 @@ install-icons:
                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
                $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done
+       for icon in $(private_icons); do \
+               THEME=`echo $$icon | cut -d_ -f1`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               mkdir -p $(DESTDIR)$(datadir)/gnome-maps/icons/$$THEME/$$SIZE/$$CONTEXT; \
+               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/gnome-maps/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
 
 uninstall-icons:
        -for icon in $(public_icons); do \
@@ -77,6 +84,13 @@ uninstall-icons:
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
                rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done
+       -for icon in $(private_icons); do \
+               THEME=`echo $$icon | cut -d_ -f1`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               rm -f $(DESTDIR)$(datadir)/gnome-mapsicons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
 
 install-data-local: install-icons
 install-data-hook: update-icon-cache
diff --git a/data/icons/maps-point-end-symbolic.svg 
b/data/icons/hicolor_apps_16x16_maps-point-end-symbolic.svg
similarity index 100%
rename from data/icons/maps-point-end-symbolic.svg
rename to data/icons/hicolor_apps_16x16_maps-point-end-symbolic.svg
diff --git a/data/icons/maps-point-end.svg b/data/icons/hicolor_apps_16x16_maps-point-end.svg
similarity index 100%
rename from data/icons/maps-point-end.svg
rename to data/icons/hicolor_apps_16x16_maps-point-end.svg
diff --git a/data/icons/maps-point-start-symbolic.svg 
b/data/icons/hicolor_apps_16x16_maps-point-start-symbolic.svg
similarity index 100%
rename from data/icons/maps-point-start-symbolic.svg
rename to data/icons/hicolor_apps_16x16_maps-point-start-symbolic.svg
diff --git a/data/icons/maps-point-start.svg b/data/icons/hicolor_apps_16x16_maps-point-start.svg
similarity index 100%
rename from data/icons/maps-point-start.svg
rename to data/icons/hicolor_apps_16x16_maps-point-start.svg
diff --git a/src/path.js.in b/src/path.js.in
index 56122ee..5b38c41 100644
--- a/src/path.js.in
+++ b/src/path.js.in
@@ -1,4 +1,4 @@
 let LOCALE_DIR = "@localedir@";
 let STYLE_DIR = "@pkgdatadir@/style/";
-let ICONS_DIR = "@pkgdatadir@/pixmaps";
+let ICONS_DIR = "@pkgdatadir@/icons/";
 let RESOURCE_DIR = "@pkgdatadir@";
diff --git a/src/searchResultMarker.js b/src/searchResultMarker.js
index fc45b10..689a2e7 100644
--- a/src/searchResultMarker.js
+++ b/src/searchResultMarker.js
@@ -34,8 +34,7 @@ const SearchResultMarker = new Lang.Class({
     _init: function(params) {
         this.parent(params);
 
-        let iconActor = Utils.CreateActorFromImageFile(Path.ICONS_DIR + "/pin.svg");
-        this.add_actor(iconActor);
+        this.add_actor(Utils.CreateActorFromIconName('maps-pin'));
     },
 
     get anchor() {
diff --git a/src/turnPointMarker.js b/src/turnPointMarker.js
index 1ca085c..834b839 100644
--- a/src/turnPointMarker.js
+++ b/src/turnPointMarker.js
@@ -105,8 +105,7 @@ const DestinationMarker = new Lang.Class({
             this._onMarkerDrag();
         }).bind(this));
 
-        let iconName = Path.ICONS_DIR + '/' + this.iconName + '.svg';
-        this.add_actor(Utils.CreateActorFromImageFile(iconName));
+        this.add_actor(Utils.CreateActorFromIconName(this.iconName));
     },
 
     _onMarkerDrag: function() {
diff --git a/src/userLocationMarker.js b/src/userLocationMarker.js
index ea124d3..fe86d9c 100644
--- a/src/userLocationMarker.js
+++ b/src/userLocationMarker.js
@@ -77,8 +77,7 @@ const UserLocationMarker = new Lang.Class({
     _init: function(params) {
         this.parent(params);
 
-        let iconActor = Utils.CreateActorFromImageFile(Path.ICONS_DIR + '/user-location.png');
-        this.add_actor(iconActor);
+        this.add_actor(Utils.CreateActorFromIconName('user-location'));
 
         if (this.place.location.accuracy !== 0) {
             this._accuracyMarker = new AccuracyCircleMarker({ place: this.place });
diff --git a/src/utils.js b/src/utils.js
index 2cc0d9a..4538af1 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -95,11 +95,10 @@ function initActions(actionMap, simpleActionEntries, context) {
     });
 }
 
-
-
-function CreateActorFromImageFile(path) {
+function CreateActorFromIconName(name) {
     try {
-        let pixbuf = GdkPixbuf.Pixbuf.new_from_file(path);
+        let theme = Gtk.IconTheme.get_default();
+        let pixbuf = theme.load_icon(name, 0, 0);
         let image = new Clutter.Image();
         image.set_data(pixbuf.get_pixels(),
                        Cogl.PixelFormat.RGBA_8888,