diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-09-19 14:41:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-09-19 14:41:18 +0000 |
| commit | 8b3742234864d8554b12153f714785bc29280012 (patch) | |
| tree | f6cef8a50a0705e13bd31b61f54f83da70f9abe2 | |
| parent | 9f974ab8617b6b7c19bac9e71d06de89d7e7bd03 (diff) | |
fix for skype event texts
git-svn-id: http://svn.miranda-ng.org/main/trunk@17319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/src/skype_events.cpp | 3 | ||||
| -rw-r--r-- | src/mir_app/src/db_events.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp index ccee39c294..73e790c97e 100644 --- a/protocols/SkypeWeb/src/skype_events.cpp +++ b/protocols/SkypeWeb/src/skype_events.cpp @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. INT_PTR CSkypeProto::GetEventText(WPARAM pEvent, LPARAM datatype)
{
- DBEVENTINFO *dbei = (DBEVENTINFO *)pEvent;
+ DBEVENTINFO *dbei = (DBEVENTINFO*)pEvent;
CMStringA szText;
@@ -29,7 +29,6 @@ INT_PTR CSkypeProto::GetEventText(WPARAM pEvent, LPARAM datatype) {
case SKYPE_DB_EVENT_TYPE_EDITED_MESSAGE:
{
-
JSONNode jMsg = JSONNode::parse((char*)dbei->pBlob);
if (jMsg)
{
diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp index 0a2b6a6431..d0c7291c9d 100644 --- a/src/mir_app/src/db_events.cpp +++ b/src/mir_app/src/db_events.cpp @@ -67,13 +67,13 @@ MIR_APP_DLL(int) DbEvent_RegisterType(DBEVENTTYPEDESCR *et) p->flags = et->flags;
char szServiceName[100];
- if (!p->textService) {
+ if (!et->textService) {
mir_snprintf(szServiceName, "%s/GetEventText%d", p->module, p->eventType);
p->textService = mir_strdup(szServiceName);
}
else p->textService = mir_strdup(et->textService);
- if (!p->iconService) {
+ if (!et->iconService) {
mir_snprintf(szServiceName, "%s/GetEventIcon%d", p->module, p->eventType);
p->iconService = mir_strdup(szServiceName);
}
|