From 4ade6831725c5531f282a527becf60030ef9d4e9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 2 Jun 2011 15:05:00 +0200
Subject: [PATCH] netsrpm plugins: don't use konsole-nofork, launch
 openmamba-netsrpm from .desktop files

---
 Makefile                                              | 2 +-
 menu/applications/netinstall/b43-firmware.desktop.in  | 2 +-
 menu/applications/netinstall/flashplugin.desktop.in   | 2 +-
 menu/applications/netinstall/jre.desktop.pregpl.in    | 2 +-
 menu/applications/netinstall/msttcorefonts.desktop.in | 2 +-
 menu/applications/netinstall/skype.desktop.in         | 2 +-
 menu/applications/netinstall/win32codecs.desktop.in   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d596f20..a548cf6 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
+#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
diff --git a/menu/applications/netinstall/b43-firmware.desktop.in b/menu/applications/netinstall/b43-firmware.desktop.in
index a4b02a1..0dd5c44 100644
--- a/menu/applications/netinstall/b43-firmware.desktop.in
+++ b/menu/applications/netinstall/b43-firmware.desktop.in
@@ -8,7 +8,7 @@ Comment[es]=Instala el Broadcom B43 firmware por red
 Comment[fr]=Installation du Broadcom B43 firmware depuis le réseau
 Comment[it]=Installa il firmware Broadcom B43 dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms b43-firmware
+Exec=@bindir@/openmamba-netsrpms b43-firmware
 Icon=network-wireless
 MimeType=
 Path=
diff --git a/menu/applications/netinstall/flashplugin.desktop.in b/menu/applications/netinstall/flashplugin.desktop.in
index a722586..e5805db 100644
--- a/menu/applications/netinstall/flashplugin.desktop.in
+++ b/menu/applications/netinstall/flashplugin.desktop.in
@@ -8,7 +8,7 @@ Comment[es]=Instala el plugin Flash por red
 Comment[fr]=Installation du plugin Flash depuis le réseau
 Comment[it]=Installa il plugin Flash dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms flashplugin
+Exec=@bindir@/openmamba-netsrpms flashplugin
 Icon=distromenu-flash
 MimeType=
 Path=
diff --git a/menu/applications/netinstall/jre.desktop.pregpl.in b/menu/applications/netinstall/jre.desktop.pregpl.in
index a02a772..8883d35 100644
--- a/menu/applications/netinstall/jre.desktop.pregpl.in
+++ b/menu/applications/netinstall/jre.desktop.pregpl.in
@@ -9,6 +9,6 @@ Comment=Install Java Runtime Environment (JRE) from network
 Comment[es]=Instala el Java Runtime Environment (JRE) por red
 Comment[it]=Installa il Java Runtime Environment (JRE) dalla rete
 Comment[fr]=Installation du Java Runtime Environment (JRE) depuis le réseau
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms jre
+Exec=@bindir@/openmamba-netsrpms jre
 Icon=distromenu-java
 Categories=X-@distroID@-NetInstall;
diff --git a/menu/applications/netinstall/msttcorefonts.desktop.in b/menu/applications/netinstall/msttcorefonts.desktop.in
index cd29d61..7f89a7e 100644
--- a/menu/applications/netinstall/msttcorefonts.desktop.in
+++ b/menu/applications/netinstall/msttcorefonts.desktop.in
@@ -9,6 +9,6 @@ Comment=Install MS TrueType Core Fonts for the Web
 Comment[es]=Instala las fuentes MS TrueType para el Web
 Comment[it]=Installa i font MS TrueType per il Web
 Comment[fr]=Installation des polices MS TrueType pour le Web
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms msttcorefonts
+Exec=@bindir@/openmamba-netsrpms msttcorefonts
 Icon=fonts-package
 Categories=X-@distroID@-NetInstall;
diff --git a/menu/applications/netinstall/skype.desktop.in b/menu/applications/netinstall/skype.desktop.in
index 2b8635b..1e29638 100644
--- a/menu/applications/netinstall/skype.desktop.in
+++ b/menu/applications/netinstall/skype.desktop.in
@@ -8,7 +8,7 @@ Comment[es]=Instala Skype por red
 Comment[fr]=Installation du Skype depuis le réseau
 Comment[it]=Installa Skype dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms skype
+Exec=@bindir@/openmamba-netsrpms skype
 Icon=distromenu-skype
 MimeType=
 Path=
diff --git a/menu/applications/netinstall/win32codecs.desktop.in b/menu/applications/netinstall/win32codecs.desktop.in
index 060ba6f..3ed9f25 100644
--- a/menu/applications/netinstall/win32codecs.desktop.in
+++ b/menu/applications/netinstall/win32codecs.desktop.in
@@ -9,6 +9,6 @@ Comment=Install the multimedia win32 codecs
 Comment[es]=Instala y pon al día los Win32 codecs multimediales
 Comment[it]=Installa ed aggiorna i codec multimediali Win32
 Comment[fr]=Installation et mise à jour des codecs multimédias Win32
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms win32codecs
+Exec=@bindir@/openmamba-netsrpms win32codecs
 Icon=applications-multimedia
 Categories=X-@distroID@-NetInstall;