diff options
| author | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
| commit | 69409021aced78b31da0c9f2def7332a4c4b973e (patch) | |
| tree | 3d9a6607f042acb8d44ece5f3fb08a4125a94e45 /protocols/Twitter | |
| parent | e09448dd03e3647717166e92ee818e395041993a (diff) | |
Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"
This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.
Diffstat (limited to 'protocols/Twitter')
| -rw-r--r-- | protocols/Twitter/src/connection.cpp | 2 | ||||
| -rw-r--r-- | protocols/Twitter/src/contacts.cpp | 2 | ||||
| -rw-r--r-- | protocols/Twitter/src/theme.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 3e399e6e5e..21c7ce6cb9 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -589,7 +589,7 @@ void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg) if (!pre_read && popups) {
std::stringstream url;
url << std::string("https://twitter.com/") << i->username << std::string("/status/") << i->status.id;
- Skin_PlaySound("TwitterNew");
+ SkinPlaySound("TwitterNew");
ShowContactPopup(hContact, i->status.text, new std::string(url.str()));
}
}
diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index 9c9f6f4d50..c0bcddb4f5 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -249,7 +249,7 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status) std::string url = profile_base_url("https://twitter.com/") + http::url_encode(name);
setString(hContact, "Homepage", url.c_str());
- Skin_PlaySound("TwitterNewContact");
+ SkinPlaySound("TwitterNewContact");
DBVARIANT dbv;
if (!getWString(TWITTER_KEY_GROUP, &dbv)) {
db_set_ws(hContact, "CList", "Group", dbv.ptszVal);
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index a32b8e6e46..1040df4819 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -33,8 +33,8 @@ static IconItem icons[] = void TwitterInitSounds(void)
{
- Skin_AddSound("TwitterNewContact", LPGENW("Twitter"), LPGENW("First tweet from new contact"));
- Skin_AddSound("TwitterNew", LPGENW("Twitter"), LPGENW("New tweet"));
+ SkinAddNewSoundEx("TwitterNewContact", LPGEN("Twitter"), LPGEN("First tweet from new contact"));
+ SkinAddNewSoundEx("TwitterNew", LPGEN("Twitter"), LPGEN("New tweet"));
}
// TODO: uninit
|