Merge commit 'c5065eecd29651649c2f3d04be8af9a19d189733' into master-merge

diff --cc radiant/gtkdlgs.cpp
Simple merge

diff --cc radiant/plugintoolbar.cpp
Simple merge

diff --cc radiant/qe3.cpp
index 3b015aa4aeb70564722bbc074304c08780438e6a,efae51c42438df2c94ea4dbb88e260a618814f8c..69cf4c064c9ae12fbf46063cf0549ee6736d7a6f
--- 1/radiant/qe3.cpp
--- 2/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@@ -87,26 -86,17 +87,26 @@@ void QE_InitVFS()
  
        // editor builtin VFS
        StringOutputStream editorGamePath( 256 );
 -      editorGamePath << GlobalRadiant().getAppPath() << DEFAULT_EDITORVFS_DIRNAME;
 +      editorGamePath << GlobalRadiant().getDataPath() << DEFAULT_EDITORVFS_DIRNAME;
        GlobalFileSystem().initDirectory( editorGamePath.c_str() );
  
 +      globalOutputStream() << "engine path: " << enginepath << "\n";
 +      globalOutputStream() << "home path: " << homepath << "\n";
 +      globalOutputStream() << "base game: " << basegame << "\n";
 +      globalOutputStream() << "game name: " << gamename << "\n";
 +
        // if we have a mod dir
        if ( !string_equal( gamename, basegame ) ) {
-                       // ~/.<gameprefix>/<fs_game>
-                       if ( homepath && !g_disableHomePath ) {
-                               StringOutputStream userGamePath( 256 );
 +              // if we have a home dir
 +              if ( !string_equal( homepath, enginepath ) )
 +              {
 -              if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
+               // ~/.<gameprefix>/<fs_game>
 -                      userGamePath << userRoot << gamename << '/';
++              if ( userRoot && !string_equal( globalRoot, homepath ) && !g_disableHomePath ) {
+                       StringOutputStream userGamePath( 256 );
-                               GlobalFileSystem().initDirectory( userGamePath.c_str() );
-                       }
 +                              userGamePath << homepath << gamename << '/';
+                       GlobalFileSystem().initDirectory( userGamePath.c_str() );
+               }
 +              }
  
                // <fs_basepath>/<fs_game>
                if ( !g_disableEnginePath ) {
@@@ -116,16 -106,12 +116,16 @@@
                }
        }
  
-               // ~/.<gameprefix>/<fs_main>
-               if ( homepath && !g_disableHomePath ) {
-                       StringOutputStream userBasePath( 256 );
 +      // if we have a home dir
 +      if ( !string_equal( homepath, enginepath ) )
 +      {
 -      if ( userRoot && !string_equal( globalRoot, userRoot ) && !g_disableHomePath ) {
+       // ~/.<gameprefix>/<fs_main>
 -              userBasePath << userRoot << basegame << '/';
++      if ( userRoot && !string_equal( globalRoot, homepath ) && !g_disableHomePath ) {
+               StringOutputStream userBasePath( 256 );
-                       GlobalFileSystem().initDirectory( userBasePath.c_str() );
-               }
 +                      userBasePath << homepath << basegame << '/';
+               GlobalFileSystem().initDirectory( userBasePath.c_str() );
+       }
 +      }
  
        // <fs_basepath>/<fs_main>
        if ( !g_disableEnginePath ) {

diff --cc radiant/texwindow.cpp
index f1cc83f5bee9abd7a5429a6dc0c77e33eccdf0ff,72573afe8dd64fc723a29a5934d245464b3c48c1..46f8c390033596ccf9e0c78e4598c25dcae20d81
--- 1/radiant/texwindow.cpp
--- 2/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@@ -1598,9 -1546,9 +1600,9 @@@ gboolean TextureBrowser_button_press( u
                }
                #endif
        }
-       else if ( event->type == GDK_3BUTTON_PRESS ) {
+       else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
 -              ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" );
 -              TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() );
 +              ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getCommonShadersDir(), "Loading Textures" );
 +              TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getCommonShadersDir() );
                TextureBrowser_queueDraw( *textureBrowser );
        }
        return FALSE;