diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-08 12:01:23 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-22 15:56:42 +0200 |
| commit | 6a2645238245e1f92b4fa92fc108e4559c849da8 (patch) | |
| tree | 0494d6ba18da42e4924cebd5e9a6e8397a5c51ec /kio | |
| parent | 90d4721aa442c0faccaffc59b1e6e5d77373b456 (diff) | |
| download | tdelibs-6a2645238245e1f92b4fa92fc108e4559c849da8.tar.gz tdelibs-6a2645238245e1f92b4fa92fc108e4559c849da8.zip | |
Do not use magic_version function if magic version support not available
This relates to Bug 656
(cherry picked from commit 58c3aed2bb340467aa9734a9141ebe1d89e4074b)
Diffstat (limited to 'kio')
| -rw-r--r-- | kio/kio/kmimemagic.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index 4127e3451..f9001e5cd 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -251,7 +251,11 @@ KMimeMagic::~KMimeMagic() { bool KMimeMagic::mergeConfig(const TQString & _configfile) { conf->databases.append(_configfile); TQString merged_databases = conf->databases.join(":"); +#ifdef MAGIC_VERSION int magicvers = magic_version(); +#else // MAGIC_VERSION + int magicvers = 0; +#endif // MAGIC_VERSION if ((magicvers < 512) || (magicvers >= 518)) { if (magic_load(conf->magic, merged_databases.latin1()) == 0) { return true; |