icons/Makefile.am icons/nm-vpn-standalone-lock.png

2008-04-08  Dan Williams  <dcbw@redhat.com>

	* icons/Makefile.am
	  icons/nm-vpn-standalone-lock.png
	  icons/nm-vpn-active-lock.png
		- Split VPN lock icons; add 16x16 centered icon for connection editor

	* icons/nm-vpn-lock.png
		- remove

	* src/applet.c
		- (nma_icons_load): use nm-vpn-active-lock.png

	* src/connection-editor/nm-connection-list.c
		- (new_connection_list): allow NULL icon pixbuf
		- (nm_connection_list_init): don't init stuff here because it can fail
		- (dispose): don't dispose of stuff that's not allocated
		- (nm_connection_list_new): init stuff here and clean up if it fails

	* src/connection-editor/main.c
		- (main): exit cleanly on init failure


svn path=/trunk/; revision=657

3 files changed, 10 insertions, 3 deletions

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 29112590..b33ce424 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -63,9 +63,16 @@ smallicon_DATA=		\
 	nm-vpn-connecting12.png	\
 	nm-vpn-connecting13.png	\
 	nm-vpn-connecting14.png	\
-	nm-vpn-lock.png	\
+	nm-vpn-active-lock.png	\
+	$(NULL)
+
+smallericondir=${datadir}/icons/hicolor/16x16/apps
+smallericon_DATA= \
+	nm-vpn-standalone-lock.png \
 	$(NULL)
 
 EXTRA_DIST=\
-	$(largeicon_DATA)	\
-	$(smallicon_DATA)
+	$(largeicon_DATA) \
+	$(smallicon_DATA) \
+	$(smallericon_DATA)
+
diff --git a/icons/nm-vpn-lock.png b/icons/nm-vpn-active-lock.png
index 8a616968..8a616968 100644
--- a/icons/nm-vpn-lock.png
+++ b/icons/nm-vpn-active-lock.png
diff --git a/icons/nm-vpn-standalone-lock.png b/icons/nm-vpn-standalone-lock.png
new file mode 100644
index 00000000..05241d75
--- /dev/null
+++ b/icons/nm-vpn-standalone-lock.png