diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 16:19:57 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-22 15:56:42 +0200 |
| commit | 562d0b76429bccfbf4a66e509632063d99e18147 (patch) | |
| tree | f02355b5dffcda6a2ad5790292b3c33b6dd3eff4 | |
| parent | 602501b7b86a664a213399dd8a9c38670be60e4f (diff) | |
| download | tdelibs-562d0b76429bccfbf4a66e509632063d99e18147.tar.gz tdelibs-562d0b76429bccfbf4a66e509632063d99e18147.zip | |
Fix loading of additional mime magic files
This resolves Bug 656
(cherry picked from commit 62bfcbe4780e5b08aee6a16895f5e508f0646bd2)
| -rw-r--r-- | kio/kio/kmimemagic.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index 871a262a2..362dd3d45 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -150,7 +150,6 @@ struct config_rec { int accuracy; magic_t magic; - TQStringList databases; KMimeMagicUtimeConf * utimeConf; }; @@ -159,9 +158,7 @@ struct config_rec { * apprentice - load configuration from the magic file. */ int KMimeMagic::apprentice( const TQString& magicfile ) { - conf->databases.clear(); - conf->databases.append(magicfile); - return magic_load(conf->magic, conf->databases[0].latin1()); + return magic_load(conf->magic, magicfile.latin1()); } /* @@ -242,9 +239,7 @@ KMimeMagic::~KMimeMagic() { } bool KMimeMagic::mergeConfig(const TQString & _configfile) { - conf->databases.append(_configfile); - TQString merged_databases = conf->databases.join(":"); - if (magic_load(conf->magic, merged_databases.latin1()) == 0) { + if (magic_load(conf->magic, _configfile.latin1()) == 0) { return true; } else { |