Install icons in the correct place

and rename the status area icons to the common naming scheme.

diff --git a/Makefile.am b/Makefile.am
index b155995..c138b7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ icon48_DATA = \
        data/tor_onion.png
 
 icon18_DATA = \
-       data/tor_status_connected.png \
-       data/tor_status_connecting.png
+       data/statusarea_tor_connected.png \
+       data/statusarea_tor_connecting.png
 
 status_area_applet_tor_la_SOURCES = \
        src/status-area-applet-tor.c

diff --git a/configure.ac b/configure.ac
index 778dad7..cede3e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,8 +43,8 @@ AC_SUBST(DBUS_CFLAGS)
 PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.9.2)
 
 localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
-icon48dir=`$PKG_CONFIG libhildondesktop-1 --variable=prefix`/share/icons/hicolor/48x48
-icon18dir=`$PKG_CONFIG libhildondesktop-1 --variable=prefix`/share/icons/hicolor/18x18
+icon48dir=`$PKG_CONFIG libhildondesktop-1 --variable=prefix`/share/icons/hicolor/48x48/hildon
+icon18dir=`$PKG_CONFIG libhildondesktop-1 --variable=prefix`/share/icons/hicolor/18x18/hildon
 hildondesktoplibdir=`$PKG_CONFIG libhildondesktop-1 --variable=hildondesktoplibdir`
 hildonstatusmenudesktopentrydir=`$PKG_CONFIG libhildondesktop-1 --variable=hildonstatusmenudesktopentrydir`
 

diff --git a/data/statusarea_tor_connected.png b/data/statusarea_tor_connected.png
new file mode 100644 (file)
index 0000000..24ef83d
Binary files /dev/null and b/data/statusarea_tor_connected.png differ

diff --git a/data/statusarea_tor_connecting.png b/data/statusarea_tor_connecting.png
new file mode 100644 (file)
index 0000000..a9333fe
Binary files /dev/null and b/data/statusarea_tor_connecting.png differ

diff --git a/data/tor_status_connected.png b/data/tor_status_connected.png
deleted file mode 100644 (file)
index 24ef83d..0000000
Binary files a/data/tor_status_connected.png and /dev/null differ

diff --git a/data/tor_status_connecting.png b/data/tor_status_connecting.png
deleted file mode 100644 (file)
index a9333fe..0000000
Binary files a/data/tor_status_connecting.png and /dev/null differ

diff --git a/src/status-area-applet-tor.vala b/src/status-area-applet-tor.vala
index 678bb48..b503232 100644 (file)
--- a/src/status-area-applet-tor.vala
+++ b/src/status-area-applet-tor.vala
@@ -79,7 +79,7 @@ class TorStatusMenuItem : HD.StatusMenuItem {
 
                if (tor_enabled && tor_connected && icon_connected == null) try {
                        icon_theme = Gtk.IconTheme.get_default ();
-                       pixbuf = icon_theme.load_icon ("tor_status_connected",
+                       pixbuf = icon_theme.load_icon ("statusarea_tor_connected",
                                                       STATUS_AREA_ICON_SIZE,
                                                       Gtk.IconLookupFlags.NO_SVG);
                        icon_connected = pixbuf;
@@ -88,7 +88,7 @@ class TorStatusMenuItem : HD.StatusMenuItem {
                }
                if (tor_enabled && !tor_connected && icon_connecting == null) try {
                        icon_theme = Gtk.IconTheme.get_default ();
-                       pixbuf = icon_theme.load_icon ("tor_status_connecting",
+                       pixbuf = icon_theme.load_icon ("statusarea_tor_connecting",
                                                       STATUS_AREA_ICON_SIZE,
                                                       Gtk.IconLookupFlags.NO_SVG);
                        icon_connecting = pixbuf;