[rkward/frameworks] rkward: changed *.desktop files into org.kde.* files

[m.eik michalke]

Git commit 4c0dbce1b17f107722ff380853ae5e87b44846f9 by m.eik michalke.
Committed on 16/08/2016 at 18:34.
Pushed by meikm into branch 'frameworks'.

changed *.desktop files into org.kde.* files

  - in accordance with https://community.kde.org/Frameworks/Porting_Notes#Application

M  +1    -1    rkward/CMakeLists.txt
R  +1    -0    rkward/org.kde.rkward-open.desktop [from: rkward/rkward-open.desktop - 097% similarity]
R  +2    -1    rkward/org.kde.rkward.desktop [from: rkward/rkward.desktop - 093% similarity]
M  +1    -1    rkward/rkward_startup_wrapper.cpp

http://commits.kde.org/rkward/4c0dbce1b17f107722ff380853ae5e87b44846f9

diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
old mode 100644
new mode 100755
index d9fe31e..48962fb
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -92,6 +92,6 @@ ELSE(Q_WS_MAC)
 	INSTALL(TARGETS rkward DESTINATION ${BIN_INSTALL_DIR})
 ENDIF(Q_WS_MAC)
 
-INSTALL(FILES rkward.desktop rkward-open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+INSTALL(FILES org.kde.rkward.desktop org.kde.rkward-open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 INSTALL(FILES vnd.rkward.r.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
 INSTALL(FILES rkward.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/rkward/rkward-open.desktop b/rkward/org.kde.rkward-open.desktop
similarity index 97%
rename from rkward/rkward-open.desktop
rename to rkward/org.kde.rkward-open.desktop
index 30368de..c6fe30f 100644
--- a/rkward/rkward-open.desktop
+++ b/rkward/org.kde.rkward-open.desktop
@@ -49,6 +49,7 @@ Comment[sv]=Grafiskt användargränssnitt för R-projektet
 Comment[uk]=Графічний інтерфейс проекту R
 Comment[x-test]=xxGUI for the R-projectxx
 Icon=rkward
+X-DBUS-ServiceName=org.kde.rkward-open
 Exec=rkward --reuse %F
 Terminal=false
 Type=Application
diff --git a/rkward/rkward.desktop b/rkward/org.kde.rkward.desktop
old mode 100644
new mode 100755
similarity index 93%
rename from rkward/rkward.desktop
rename to rkward/org.kde.rkward.desktop
index c56b525..de75e66
--- a/rkward/rkward.desktop
+++ b/rkward/org.kde.rkward.desktop
@@ -49,7 +49,8 @@ Comment[sv]=Grafiskt användargränssnitt för R-projektet
 Comment[uk]=Графічний інтерфейс проекту R
 Comment[x-test]=xxGUI for the R-projectxx
 Icon=rkward
-Exec=sh -c "STARTUP_ID_COPY=\\${DESKTOP_STARTUP_ID} rkward -caption '%c' %i"
+X-DBUS-ServiceName=org.kde.rkward
+Exec=sh -c "STARTUP_ID_COPY=\\${DESKTOP_STARTUP_ID} rkward -qwindowtitle '%c'"
 Terminal=false
 Type=Application
 X-DocPath=rkward/index.html
diff --git a/rkward/rkward_startup_wrapper.cpp b/rkward/rkward_startup_wrapper.cpp
old mode 100644
new mode 100755
index 8ca417a..1828fc3
--- a/rkward/rkward_startup_wrapper.cpp
+++ b/rkward/rkward_startup_wrapper.cpp
@@ -106,7 +106,7 @@ int main (int argc, char *argv[]) {
 	QApplication app (argc, argv);
 	QStringList args = app.arguments ();
 	if (!args.isEmpty ()) args.pop_front ();	// The command itself
-	qputenv ("DESKTOP_STARTUP_ID", qgetenv ("STARTUP_ID_COPY"));	// for startup notifications (set via rkward.desktop)
+	qputenv ("DESKTOP_STARTUP_ID", qgetenv ("STARTUP_ID_COPY"));	// for startup notifications (set via org.kde.rkward.desktop)
 	qputenv ("STARTUP_ID_COPY", "");
 
 	// Parse arguments that need handling in the wrapper