| Index: src/plugin/PluginConfiguration.h |
| =================================================================== |
| --- a/src/plugin/PluginConfiguration.h |
| +++ b/src/plugin/PluginConfiguration.h |
| @@ -16,17 +16,16 @@ public: |
| // Refresh (download) configuration |
| bool Download(); |
| void Invalidate(); |
| // Is configuration valid |
| bool IsValid() const; |
| bool IsValidUserId() const; |
| bool IsValidPluginExpired() const; |
| - bool IsValidPluginUpdate() const; |
| bool IsValidPluginInfoPanel() const; |
| bool IsValidDictionary() const; |
| #ifdef SUPPORT_FILTER |
| bool IsValidFilter() const; |
| #endif |
| #ifdef SUPPORT_WHITELIST |
| bool IsValidWhiteList() const; |
| #endif |
| @@ -38,39 +37,34 @@ public: |
| bool IsPluginActivated() const; |
| bool IsPluginRegistered() const; |
| bool IsPluginActivateEnabled() const; |
| bool IsPluginExpired() const; |
| int GetAdBlockLimit() const; |
| CString GetUserId() const; |
| - // Does there exists a new version, that can be downloaded and installed |
| - CString GetPluginUpdateVersion() const; |
| - CString GetPluginUpdateUrl() const; |
| - |
| int GetPluginInfoPanel() const; |
| // Dictionary information |
| - int GetDictionaryVersion() const; |
| - CString GetDictionaryUrl() const; |
| + int GetDictionaryVersion() const; |
| + CString GetDictionaryUrl() const; |
| #ifdef SUPPORT_CONFIG |
| CString GetConfigUrl() const; |
| int GetConfigVersion() const; |
| #endif // SUPPORT_CONFIG |
| private: |
| bool m_isValid; |
| bool m_isValidUserId; |
| bool m_isValidPluginActivated; |
| bool m_isValidPluginActivateEnabled; |
| bool m_isValidPluginExpired; |
| - bool m_isValidPluginUpdate; |
| bool m_isValidPluginInfoPanel; |
| bool m_isValidDictionary; |
| bool m_isPluginRegistered; |
| int m_adBlockLimit; |
| #ifdef SUPPORT_WHITELIST |
| bool m_isValidWhiteList; |
| #endif |
| #ifdef SUPPORT_FILTER |
| @@ -83,20 +77,16 @@ private: |
| // General plugin status |
| bool m_isPluginActivated; |
| bool m_isPluginActivateEnabled; |
| bool m_isPluginExpired; |
| // User registration |
| CString m_userId; |
| - // The version that currently can be downloaded from the server |
| - CString m_pluginUpdateVersion; |
| - CString m_pluginUpdateUrl; |
| - |
| // Dictionary that currently can be downloaded from the server |
| int m_dictionaryVersion; |
| CString m_dictionaryUrl; |
| int m_pluginInfoPanel; |
| #ifdef SUPPORT_FILTER |
| int m_filterVersion; |