Branch: master

d47440b3 2014-10-22 14:24:05 Timothy Pearson
Fix exec icon location and bring it into XDG compliance
M src/formatimporter.cpp
M src/notefactory.cpp
diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp
index 66e4bf9..f6ea820 100644
--- a/src/formatimporter.cpp
+++ b/src/formatimporter.cpp
@@ -259,7 +259,7 @@
 					"Name=%2\n"
 					"Icon=%3\n"
 					"Encoding=UTF-8\n"
-					"Type=Application\n").arg(runCommand, title, icon.isEmpty() ? TQString("exec") : icon);
+					"Type=Application\n").arg(runCommand, title, icon.isEmpty() ? TQString("application-x-executable") : icon);
 				TQString launcherFileName = Tools::fileNameForNewFile("launcher.desktop", Global::basketsFolder() + folderName /*+ "/"*/);
 				TQString launcherFullPath = Global::basketsFolder() + folderName /*+ "/"*/ + launcherFileName;
 				TQFile file(launcherFullPath);
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 2f1d75e..6074964 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -264,7 +264,7 @@
 			"Name=%2\n"
 			"Icon=%3\n"
 			"Encoding=UTF-8\n"
-			"Type=Application\n").arg(command, name, icon.isEmpty() ? TQString("exec") : icon);
+			"Type=Application\n").arg(command, name, icon.isEmpty() ? TQString("application-x-executable") : icon);
 	TQString fileName = fileNameForNewNote(parent, "launcher.desktop");
 	TQString fullPath = parent->fullPathForFileName(fileName);
 //	parent->dontCareOfCreation(fullPath);
@@ -930,7 +930,7 @@
 		icon = TQStringList::split('-', icon).first();
 	// 4. If the icon still not findable, use a generic icon
 	if ( ! isIconExist(icon) )
-		icon = "exec";
+		icon = "application-x-executable";
 
 	return icon;
 }