|
a/src/common/rclconfig.cpp |
|
b/src/common/rclconfig.cpp |
|
... |
|
... |
823 |
if (useall) {
|
823 |
if (useall) {
|
824 |
// Check for exception
|
824 |
// Check for exception
|
825 |
string excepts = getMimeViewerAllEx();
|
825 |
string excepts = getMimeViewerAllEx();
|
826 |
vector<string> vex;
|
826 |
vector<string> vex;
|
827 |
stringToTokens(excepts, vex);
|
827 |
stringToTokens(excepts, vex);
|
|
|
828 |
bool isexcept = false;
|
828 |
vector<string>::iterator it = find(vex.begin(), vex.end(), mtype);
|
829 |
for (vector<string>::iterator it = vex.begin();
|
829 |
if (it == vex.end()) {
|
830 |
it != vex.end(); it++) {
|
|
|
831 |
vector<string> mita;
|
|
|
832 |
stringToTokens(*it, mita, "|");
|
|
|
833 |
if ((mita.size() == 1 && apptag.empty() && mita[0] == mtype) ||
|
|
|
834 |
(mita.size() == 2 && mita[1] == apptag && mita[0] == mtype)) {
|
|
|
835 |
// Exception to x-all
|
|
|
836 |
isexcept = true;
|
|
|
837 |
break;
|
|
|
838 |
}
|
|
|
839 |
}
|
|
|
840 |
|
|
|
841 |
if (isexcept == false) {
|
830 |
mimeview->get("application/x-all", hs, "view");
|
842 |
mimeview->get("application/x-all", hs, "view");
|
831 |
return hs;
|
843 |
return hs;
|
832 |
}
|
844 |
}
|
833 |
// Fallthrough to normal case.
|
845 |
// Fallthrough to normal case.
|
834 |
}
|
846 |
}
|