diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-18 02:56:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-18 02:56:51 +0000 |
| commit | fe49c8de182d40528a27b84d5530698f438de51d (patch) | |
| tree | 0b559f4b38e1a4de686620b7d10972fbf7ceae47 /gtk2_ardour/main.cc | |
| parent | 67467c92e1c202b762837555aa0daecef1bd6dda (diff) | |
fix track controls height allocation to be font sensitive; fix core dump related to ownership of size menu; add nudge to keybindings; and more
git-svn-id: svn://localhost/trunk/ardour2@275 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 183729d960..3dd0da9250 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -317,17 +317,21 @@ main (int argc, char *argv[]) return curvetest (curvetest_file); } - /* desktop standard themes: just say no! */ + + if (!use_gtk_theme) { - if (getenv("GTK_RC_FILES")) { - unsetenv("GTK_RC_FILES"); - } + /* desktop standard themes: just say no! */ - if (getenv("GTK2_RC_FILES")) { - unsetenv("GTK_RC_FILES"); - } + if (getenv("GTK_RC_FILES")) { + unsetenv("GTK_RC_FILES"); + } + + if (getenv("GTK2_RC_FILES")) { + unsetenv("GTK_RC_FILES"); + } - RC::set_default_files (null_file_list); + RC::set_default_files (null_file_list); + } cout << _("Ardour/GTK ") << VERSIONSTRING |