qemu-config: Update to use system-shutdown icon

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3672 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/oh/qemu-config.bb b/meta/packages/oh/qemu-config.bb
index 6aed63b..7255851 100644 (file)
--- a/meta/packages/oh/qemu-config.bb
+++ b/meta/packages/oh/qemu-config.bb
@@ -1,13 +1,12 @@
 DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
 LICENSE = "GPL"
 RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash"
-PR = "r12"
+PR = "r14"
 
 SRC_URI = "file://distcc.sh \
            file://anjuta-remote-run \
            file://exports \
            file://shutdown.desktop \
-           file://shutdown.png \
            file://poky-chroot-init \
            file://poky-chroot-launch \
            file://qemu-autostart"
@@ -31,9 +30,6 @@ do_install() {
     install -d ${D}${datadir}/applications
     install -m 0644 shutdown.desktop ${D}${datadir}/applications/
 
-    install -d ${D}${datadir}/pixmaps
-    install -m 0644 shutdown.png ${D}${datadir}/pixmaps/
-
     install -d ${D}/etc/init.d
     install qemu-autostart ${D}/etc/init.d/
 }

diff --git a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop b/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop
index 2a42af5..b973d43 100644 (file)
--- a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop
+++ b/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Shutdown
 Comment=Close down the machine safely
 Exec=reboot
-Icon=shutdown.png
+Icon=system-shutdown
 Terminal=false
 Categories=Utility;
 StartupNotify=true
\ No newline at end of file

diff --git a/meta/packages/oh/qemu-config/shutdown.desktop b/meta/packages/oh/qemu-config/shutdown.desktop
index c1cb805..2726889 100644 (file)
--- a/meta/packages/oh/qemu-config/shutdown.desktop
+++ b/meta/packages/oh/qemu-config/shutdown.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Shutdown
 Comment=Close down the machine safely
 Exec=halt
-Icon=shutdown.png
+Icon=system-shutdown
 Terminal=false
 Categories=Utility;
 StartupNotify=true
\ No newline at end of file

diff --git a/meta/packages/oh/qemu-config/shutdown.png b/meta/packages/oh/qemu-config/shutdown.png
deleted file mode 100644 (file)
index abf3f79..0000000
Binary files a/meta/packages/oh/qemu-config/shutdown.png and /dev/null differ