--- texmaker.cpp	2009-06-14 12:42:57.000000000 -0400
+++ texmaker.cpp.new	2009-07-15 11:33:27.749640574 -0400
@@ -2352,27 +2352,9 @@
 metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
 // xdvi %.dvi  -sourceposition @:%.tex
 // kdvi "file:%.dvi#src:@ %.tex"
-switch (desktop_env)
-	{
-	case 1:
-		{
-		viewdvi_command=config->value("Tools/Dvi","evince %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","evince %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","evince %.pdf").toString();
-		}break;
-	case 2:
-		{
-		viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","kghostview %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString();
-		}break;
-	case 3:
-		{
-		viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","okular %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
-		}break;
-	}
+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
+viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
+viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
 
 
 
@@ -2524,7 +2506,7 @@
 author=config->value("Quick/Author","").toString();
 
 #if defined( Q_WS_X11 )
-QString dicDir=PREFIX"/share/texmaker/";
+QString dicDir=PREFIX"/share/myspell/";
 #endif
 #if defined( Q_WS_MACX )
 QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";