diff options
| -rw-r--r-- | protocols/SkypeWeb/res/resource.rc | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/resource.h | 1 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_options.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 1 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.h | 1 |
6 files changed, 3 insertions, 12 deletions
diff --git a/protocols/SkypeWeb/res/resource.rc b/protocols/SkypeWeb/res/resource.rc index 97dd7297eb..829f76132b 100644 --- a/protocols/SkypeWeb/res/resource.rc +++ b/protocols/SkypeWeb/res/resource.rc @@ -137,12 +137,10 @@ BEGIN EDITTEXT IDC_GROUP,79,49,117,12,ES_AUTOHSCROLL
GROUPBOX "Others",IDC_STATIC,5,79,298,65
CONTROL "Automatic messages synchronization",IDC_AUTOSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,89,176,10
- CONTROL "Always notify as unread for all incoming message",IDC_MESASUREAD,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,100,285,10
+ CONTROL "Use BBCode",IDC_BBCODES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,100,176,10
EDITTEXT IDC_PLACE,80,117,109,14,ES_AUTOHSCROLL
RTEXT "Place:",IDC_STATIC,13,120,62,11
CONTROL "Use hostname",IDC_USEHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,120,102,10
- CONTROL "Use BBCode",IDC_BBCODES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,89,102,10
CONTROL "Change password",IDC_CHANGEPASS,"Hyperlink",WS_TABSTOP,203,33,60,12
END
diff --git a/protocols/SkypeWeb/src/resource.h b/protocols/SkypeWeb/src/resource.h index 031daa51b0..206b116668 100644 --- a/protocols/SkypeWeb/src/resource.h +++ b/protocols/SkypeWeb/src/resource.h @@ -24,7 +24,6 @@ #define IDC_CLIST 1030
#define IDC_TITLE 1031
#define IDC_CONTACT 1032
-#define IDC_MESASUREAD 1033
#define IDC_PLACE 1034
#define IDC_USEHOST 1035
#define IDC_CHECK1 1036
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 849c872028..3ce3d1c028 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -32,7 +32,6 @@ void CSkypeProto::OnGetServerHistory(MHttpResponse *response, AsyncHttpRequest * int totalCount = metadata["totalCount"].as_int();
std::string syncState = metadata["syncState"].as_string();
- bool markAllAsUnread = getBool("MarkMesUnread", true);
bool bUseLocalTime = !bUseServerTime && pRequest->pUserInfo != 0;
bool bSetLastTime = false;
@@ -65,8 +64,7 @@ void CSkypeProto::OnGetServerHistory(MHttpResponse *response, AsyncHttpRequest * }
dbei.flags = DBEF_UTF;
- if (!markAllAsUnread)
- dbei.flags |= DBEF_READ;
+ dbei.flags |= DBEF_READ;
if (IsMe(szFrom))
dbei.flags |= DBEF_SENT;
diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index 0705e3b850..84c1c04966 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. class CSkypeOptionsMain : public CSkypeDlgBase
{
CCtrlEdit m_skypename, m_password, m_group, m_place;
- CCtrlCheck m_autosync, m_allasunread, m_usehostname, m_usebb;
+ CCtrlCheck m_autosync, m_usehostname, m_usebb;
CCtrlHyperlink m_link;
public:
@@ -31,14 +31,12 @@ public: m_group(this, IDC_GROUP),
m_place(this, IDC_PLACE),
m_autosync(this, IDC_AUTOSYNC),
- m_allasunread(this, IDC_MESASUREAD),
m_usehostname(this, IDC_USEHOST),
m_usebb(this, IDC_BBCODES),
m_link(this, IDC_CHANGEPASS, "https://login.skype.com/recovery/password-change") // TODO : ...?username=%username%
{
CreateLink(m_group, proto->wstrCListGroup);
CreateLink(m_autosync, proto->bAutoHistorySync);
- CreateLink(m_allasunread, proto->bMarkAllAsUnread);
CreateLink(m_place, proto->wstrPlace);
CreateLink(m_usehostname, proto->bUseHostnameAsPlace);
CreateLink(m_usebb, proto->bUseBBCodes);
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 9cee58b515..03315502a4 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -24,7 +24,6 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) : m_impl(*this),
m_requests(1),
bAutoHistorySync(this, "AutoSync", true),
- bMarkAllAsUnread(this, "MarkMesUnread", true),
bUseHostnameAsPlace(this, "UseHostName", true),
bUseBBCodes(this, "UseBBCodes", true),
bUseServerTime(this, "UseServerTime", false),
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index 3d890f2eca..ebddc9ba3d 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -107,7 +107,6 @@ public: // settings
CMOption<bool> bAutoHistorySync;
- CMOption<bool> bMarkAllAsUnread;
CMOption<bool> bUseBBCodes;
CMOption<bool> bUseServerTime; // hidden setting!
|