Switch to unified view

a/src/common/rclconfig.h b/src/common/rclconfig.h
...
...
250
250
251
    /** Find exec file for external filter. cmd is the command name from the
251
    /** Find exec file for external filter. cmd is the command name from the
252
     * command string returned by getMimeHandlerDef */
252
     * command string returned by getMimeHandlerDef */
253
    string findFilter(const string& cmd) const;
253
    string findFilter(const string& cmd) const;
254
254
255
    /** Thread config init is not done automatically because not all
256
  programs need it and it uses debuglog so that it's better to
257
  call it after primary init */
258
    void initThrConf();
259
255
    ~RclConfig() {
260
    ~RclConfig() {
256
    freeAll();
261
    freeAll();
257
    }
262
    }
258
263
259
    RclConfig(const RclConfig &r) {
264
    RclConfig(const RclConfig &r) {
...
...
301
    string m_defcharset;
306
    string m_defcharset;
302
    static string o_localecharset;
307
    static string o_localecharset;
303
    // Limiting set of mime types to be processed. Normally empty.
308
    // Limiting set of mime types to be processed. Normally empty.
304
    ParamStale    m_rmtstate;
309
    ParamStale    m_rmtstate;
305
    set<string>   m_restrictMTypes; 
310
    set<string>   m_restrictMTypes; 
311
    vector<pair<int, int> > m_thrConf;
306
312
307
    /** Create initial user configuration */
313
    /** Create initial user configuration */
308
    bool initUserConfig();
314
    bool initUserConfig();
309
    /** Copy from other */
315
    /** Copy from other */
310
    void initFrom(const RclConfig& r);
316
    void initFrom(const RclConfig& r);