Fix ardour2 -> ardour3 issues.

git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 31 insertions, 31 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index a97b45dc54..2667cfa5a5 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -532,36 +532,36 @@ env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
 if env['FREEDESKTOP']:
 	desktop_icon_install_prefix = install_prefix + '/share/icons/hicolor'
 	# Install the desktop icons to the default locations #
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour2.png'), 'icons/ardour_icon_16px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour2.png'), 'icons/ardour_icon_22px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour2.png'), 'icons/ardour_icon_32px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour2.png'), 'icons/ardour_icon_48px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour3.png'), 'icons/ardour_icon_16px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour3.png'), 'icons/ardour_icon_22px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour3.png'), 'icons/ardour_icon_32px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour3.png'), 'icons/ardour_icon_48px.png'))
 	# Install the mime type xml file and its icon #
-        env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour2.xml'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_16px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
-	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
+	env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour3.xml'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_16px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_22px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_32px.png'))
+	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_48px.png'))
 	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
 	# Update the icon cache #
 	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
 	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
-	# Make the ardour2.desktop file and install it #
-	env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES  > $TARGET'))
-	env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
+	# Make the ardour3.desktop file and install it #
+	env.Alias('install', env.Command ('ardour3.desktop', 'ardour3.desktop.in', 'cat $SOURCES  > $TARGET'))
+	env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour3.desktop'))
 	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
 	# uninstall target.. needed to run  update-mime-database and update-desktop-database after removal. #`
 	remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
-                             [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),
-			       Delete (install_prefix + '/share/applications/ardour2.desktop'),
-			       Delete (desktop_icon_install_prefix + '/16x16/apps/ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/22x22/apps/ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/32x32/apps/ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/48x48/apps/ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour2.png'),
-			       Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour2.png'),
+                             [ Delete (install_prefix + '/share/mime/packages/ardour3.xml'),
+			       Delete (install_prefix + '/share/applications/ardour3.desktop'),
+			       Delete (desktop_icon_install_prefix + '/16x16/apps/ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/22x22/apps/ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/32x32/apps/ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/48x48/apps/ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour3.png'),
+			       Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour3.png'),
                                Action ('update-mime-database ' + install_prefix + '/share/mime'),
                                Action ('gtk-update-icon-cache ' + desktop_icon_install_prefix),
                                Action ('update-desktop-database ' + install_prefix + '/share/applications')])
@@ -589,8 +589,8 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
 					'SAE-de-nokeypad.bindings.in', 
 					'ardour3_ui_default.conf',
 					'editor_xpms',
-					'ardour2.xml',
-					'ardour2.desktop.in'
+					'ardour3.xml',
+					'ardour3.desktop.in'
                                         ] +
                                       gtkardour_files +
 				      vst_files +
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index b1281354ba..6b870fb4e2 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -7,10 +7,10 @@ export ARDOUR_SURFACES_PATH=libs/surfaces/osc:libs/surfaces/generic_midi:libs/su
 export ARDOUR_DATA_PATH=gtk2_ardour:.
 if test -d $HOME/gtk/inst ; then
     echo USING NEW CLEARLOOKS
-    export GTK_PATH=~/.ardour2:libs/clearlooks-newer
+    export GTK_PATH=~/.ardour3:libs/clearlooks-newer
 else
     echo USING OLD CLEARLOOKS
-    export GTK_PATH=~/.ardour2:libs/clearlooks-older
+    export GTK_PATH=~/.ardour3:libs/clearlooks-older
 fi
 export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
 
diff --git a/gtk2_ardour/ardour2.desktop.in b/gtk2_ardour/ardour3.desktop.in
index b5911e89b4..d32cb1d153 100644
--- a/gtk2_ardour/ardour2.desktop.in
+++ b/gtk2_ardour/ardour3.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Ardour
 Comment=Ardour Digital Audio Workstation
-Exec=ardour2
-Icon=ardour2
+Exec=ardour3
+Icon=ardour3
 Terminal=false
-MimeType=application/x-ardour2;
+MimeType=application/x-ardour3;
 Type=Application
 Categories=AudioVideo;Audio;X-Recorders;X-Multitrack;X-Jack;
diff --git a/gtk2_ardour/ardour2.xml b/gtk2_ardour/ardour3.xml
index dd1c46ecf2..4b101c621b 100644
--- a/gtk2_ardour/ardour2.xml
+++ b/gtk2_ardour/ardour3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-ardour2">
+  <mime-type type="application/x-ardour3">
   <sub-class-of type="application/xml"/>
   <comment>Ardour session file</comment>
   <glob pattern="*.ardour"/>
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index c1b3a853d1..0d13200513 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -275,7 +275,7 @@ ThemeManager::setup_theme ()
 	ColorsChanged.emit();
 
 	bool env_defined = false;
-	string rcfile = Glib::getenv("ARDOUR2_UI_RC", env_defined);
+	string rcfile = Glib::getenv("ARDOUR3_UI_RC", env_defined);
 
 	if(!env_defined) {
 		rcfile = ARDOUR_UI::config()->ui_rc_file.get();