network-manager-applet r1154 - in trunk: . icons icons/16 icons/22 icons/48 icons/scalable

[dcbw svn gnome org]

Author: dcbw
Date: Thu Feb 12 15:41:37 2009
New Revision: 1154
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1154&view=rev

Log:
2009-02-12  Dan Williams  <dcbw redhat com>

	* icons/
		- Fix fallout from icon move; install icons to the right directories



Added:
   trunk/icons/48/
   trunk/icons/48/Makefile.am
   trunk/icons/48/nm-device-wireless.png
      - copied unchanged from r1152, /trunk/icons/22/nm-device-wireless.png
Removed:
   trunk/icons/22/nm-device-wireless.png
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/icons/16/Makefile.am
   trunk/icons/Makefile.am
   trunk/icons/scalable/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb 12 15:41:37 2009
@@ -228,6 +228,7 @@
 icons/16/Makefile
 icons/22/Makefile
 icons/32/Makefile
+icons/48/Makefile
 icons/scalable/Makefile
 po/Makefile.in
 ])

Modified: trunk/icons/16/Makefile.am
==============================================================================
--- trunk/icons/16/Makefile.am	(original)
+++ trunk/icons/16/Makefile.am	Thu Feb 12 15:41:37 2009
@@ -1,4 +1,4 @@
-icondir=${datadir}/icons/hicolor/scalable/apps
+icondir=${datadir}/icons/hicolor/16x16/apps
 icon_DATA = \
 	nm-device-wired.png \
 	nm-no-connection.png \

Added: trunk/icons/48/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/icons/48/Makefile.am	Thu Feb 12 15:41:37 2009
@@ -0,0 +1,6 @@
+icondir=${datadir}/icons/hicolor/48x48/apps
+icon_DATA = \
+	nm-device-wireless.png
+
+EXTRA_DIST = $(icon_DATA)
+

Modified: trunk/icons/Makefile.am
==============================================================================
--- trunk/icons/Makefile.am	(original)
+++ trunk/icons/Makefile.am	Thu Feb 12 15:41:37 2009
@@ -1,2 +1,2 @@
-SUBDIRS=16 22 32 scalable
+SUBDIRS=16 22 32 48 scalable
 

Modified: trunk/icons/scalable/Makefile.am
==============================================================================
--- trunk/icons/scalable/Makefile.am	(original)
+++ trunk/icons/scalable/Makefile.am	Thu Feb 12 15:41:37 2009
@@ -1,4 +1,4 @@
-icondir=${datadir}/icons/hicolor/16x16/apps
+icondir=${datadir}/icons/hicolor/scalable/apps
 icon_DATA = \
 	nm-device-wired.svg \
 	nm-no-connection.svg