diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-31 14:04:40 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-31 14:04:40 +0300 |
| commit | 5973a828875dc28b81d0a3882180de38984c7ac5 (patch) | |
| tree | 85ba723768343512954f64e9f9c99f79fd5ecdac | |
| parent | e36478e5c3bc275e29604c501dd0abdf90d20d55 (diff) | |
port of fix #1386 for stable
| -rw-r--r-- | src/mir_app/src/chat_opts.cpp | 12 | ||||
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mir_app/src/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp index 2282f53374..86aeb4d010 100644 --- a/src/mir_app/src/chat_opts.cpp +++ b/src/mir_app/src/chat_opts.cpp @@ -323,18 +323,6 @@ int OptionsInit(void) g_Settings->UserListHeadingsFont = nullptr;
g_Settings->iWidth = db_get_dw(0, CHAT_MODULE, "roomwidth", -1);
g_Settings->iHeight = db_get_dw(0, CHAT_MODULE, "roomheight", -1);
-
- Skin_AddSound("ChatMessage", LPGENW("Group chats"), LPGENW("Incoming message"));
- Skin_AddSound("ChatHighlight", LPGENW("Group chats"), LPGENW("Message is highlighted"));
- Skin_AddSound("ChatAction", LPGENW("Group chats"), LPGENW("User has performed an action"));
- Skin_AddSound("ChatJoin", LPGENW("Group chats"), LPGENW("User has joined"));
- Skin_AddSound("ChatPart", LPGENW("Group chats"), LPGENW("User has left"));
- Skin_AddSound("ChatKick", LPGENW("Group chats"), LPGENW("User has kicked some other user"));
- Skin_AddSound("ChatMode", LPGENW("Group chats"), LPGENW("User's status was changed"));
- Skin_AddSound("ChatNick", LPGENW("Group chats"), LPGENW("User has changed name"));
- Skin_AddSound("ChatNotice", LPGENW("Group chats"), LPGENW("User has sent a notice"));
- Skin_AddSound("ChatQuit", LPGENW("Group chats"), LPGENW("User has disconnected"));
- Skin_AddSound("ChatTopic", LPGENW("Group chats"), LPGENW("The topic has been changed"));
return 0;
}
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index 0984708610..e1a0f0b3a5 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -771,6 +771,18 @@ int LoadChatModule(void) g_hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_SRMM));
TranslateMenu(g_hMenu);
+ Skin_AddSound("ChatMessage", LPGENW("Group chats"), LPGENW("Incoming message"));
+ Skin_AddSound("ChatHighlight", LPGENW("Group chats"), LPGENW("Message is highlighted"));
+ Skin_AddSound("ChatAction", LPGENW("Group chats"), LPGENW("User has performed an action"));
+ Skin_AddSound("ChatJoin", LPGENW("Group chats"), LPGENW("User has joined"));
+ Skin_AddSound("ChatPart", LPGENW("Group chats"), LPGENW("User has left"));
+ Skin_AddSound("ChatKick", LPGENW("Group chats"), LPGENW("User has kicked some other user"));
+ Skin_AddSound("ChatMode", LPGENW("Group chats"), LPGENW("User's status was changed"));
+ Skin_AddSound("ChatNick", LPGENW("Group chats"), LPGENW("User has changed name"));
+ Skin_AddSound("ChatNotice", LPGENW("Group chats"), LPGENW("User has sent a notice"));
+ Skin_AddSound("ChatQuit", LPGENW("Group chats"), LPGENW("User has disconnected"));
+ Skin_AddSound("ChatTopic", LPGENW("Group chats"), LPGENW("The topic has been changed"));
+
bInited = true;
return 0;
}
|