From f3957355aa96e83438f4a7df42b07e620230a40d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 25 Jan 2010 19:03:11 +0100 Subject: [PATCH] Install icons in the correct place and rename the status area icons to the common naming scheme. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- data/statusarea_tor_connected.png | Bin 0 -> 382 bytes data/statusarea_tor_connecting.png | Bin 0 -> 363 bytes data/tor_status_connected.png | Bin 382 -> 0 bytes data/tor_status_connecting.png | Bin 363 -> 0 bytes src/status-area-applet-tor.vala | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 data/statusarea_tor_connected.png create mode 100644 data/statusarea_tor_connecting.png delete mode 100644 data/tor_status_connected.png delete mode 100644 data/tor_status_connecting.png diff --git a/Makefile.am b/Makefile.am index b155995..c138b7e 100644 --- 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 --- 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 index 0000000000000000000000000000000000000000..24ef83d43835d3ab565dce5b846bac425e6c486f GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}Y)RhkExW6c zy`nhH*63;__eIA>g`f6@`_>BDraZO~Qm+q?HtMWlly1E)YgGSXUXjw~MTUz+%7de- z-*%eJtut)x{wH|Xgu{YCUsq`7>NWp^?`BRtvGLcEy6+rfueR>83=@{J+otx1>2s)E Vv4g~317Junc)I$ztaD0e0suoBilzVn literal 0 HcmV?d00001 diff --git a/data/statusarea_tor_connecting.png b/data/statusarea_tor_connecting.png new file mode 100644 index 0000000000000000000000000000000000000000..a9333feadb0a388d3d2120399cc9410bb7a47593 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPiqmYm)ui?WVoIs)1o-U3d7N@sP z*_h?zDBya&wj)=7yE(Lrg_T(;iml#3K(Tb6R{VrZ`WrkZdl`6ig-qMF(PMeStnAHV zcJuPZJ1?KnGpR+-fqtrtmsr#ie`~$muA#5Z zsG(zhaR1!qBUZ0&%P~eL#4Yg_^0;)#>;T7(ZqEs>kG>x?&oM7jo-by%_&o0irYpq@ zXD&IfGU2WJgPluGPhFDvGGkl5vH)}L?Z-3R4tJy-=d3ckz$_kBc5<>OW9~ohEgm-C zgSjSsVXbjjs6Sxx)oEM9@(=%Iy5BlYxW6c zy`nhH*63;__eIA>g`f6@`_>BDraZO~Qm+q?HtMWlly1E)YgGSXUXjw~MTUz+%7de- z-*%eJtut)x{wH|Xgu{YCUsq`7>NWp^?`BRtvGLcEy6+rfueR>83=@{J+otx1>2s)E Vv4g~317Junc)I$ztaD0e0suoBilzVn diff --git a/data/tor_status_connecting.png b/data/tor_status_connecting.png deleted file mode 100644 index a9333feadb0a388d3d2120399cc9410bb7a47593..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPiqmYm)ui?WVoIs)1o-U3d7N@sP z*_h?zDBya&wj)=7yE(Lrg_T(;iml#3K(Tb6R{VrZ`WrkZdl`6ig-qMF(PMeStnAHV zcJuPZJ1?KnGpR+-fqtrtmsr#ie`~$muA#5Z zsG(zhaR1!qBUZ0&%P~eL#4Yg_^0;)#>;T7(ZqEs>kG>x?&oM7jo-by%_&o0irYpq@ zXD&IfGU2WJgPluGPhFDvGGkl5vH)}L?Z-3R4tJy-=d3ckz$_kBc5<>OW9~ohEgm-C zgSjSsVXbjjs6Sxx)oEM9@(=%Iy5BlY