summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 16:19:57 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 16:19:57 -0500
commit62bfcbe4780e5b08aee6a16895f5e508f0646bd2 (patch)
tree4d62fed4521eeb6e2ca1de275967b918f2395262
parenta3e63055fb437000c05c3cc996c5c44a4c21991d (diff)
downloadtdelibs-62bfcbe4780e5b08aee6a16895f5e508f0646bd2.tar.gz
tdelibs-62bfcbe4780e5b08aee6a16895f5e508f0646bd2.zip
Fix loading of additional mime magic files
This resolves Bug 656
-rw-r--r--tdeio/tdeio/kmimemagic.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index ea0a30498..061407ee9 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/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 {