diff options
Diffstat (limited to 'plugins/MirOTR/src')
| -rw-r--r-- | plugins/MirOTR/src/mirotrmenu.cpp | 18 | ||||
| -rw-r--r-- | plugins/MirOTR/src/utils.cpp | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp index 22bdb8deaf..6e56bbde66 100644 --- a/plugins/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/src/mirotrmenu.cpp @@ -101,22 +101,6 @@ INT_PTR FreeOwnerDataMirOTRMenu(WPARAM, LPARAM lParam) return 0; } -INT_PTR OnAddMenuItemMirOTRMenu(WPARAM wParam, LPARAM lParam) -{ - MENUITEMINFO *mii = (MENUITEMINFO*)wParam; - if (!mii || mii->cbSize != sizeof(MENUITEMINFO)) - return 0; - - TMO_MenuItem mi; - if (Menu_GetItemInfo((HGENMENU)lParam, mi) == 0) { - if (mi.flags & CMIF_DISABLED) { - mii->fMask |= MIIM_STATE; - mii->fState |= MF_DISABLED; - } - } - return 1; -} - LRESULT CALLBACK PopupMenuWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { @@ -159,11 +143,9 @@ void InitMirOTRMenu(void) // menu object CreateServiceFunction("MIROTRMENUS/FreeOwnerDataMirOTRMenu", FreeOwnerDataMirOTRMenu); - CreateServiceFunction("MIROTRMENUS/OnAddMenuItemMirOTRMenu", OnAddMenuItemMirOTRMenu); hMirOTRMenuObject = Menu_AddObject("MirOTRMenu", LPGEN("MirOTR menu"), "MirOTRMenuCheckService", "MirOTRMenuExecService"); Menu_ConfigureObject(hMirOTRMenuObject, MCO_OPT_FREE_SERVICE, "MIROTRMENUS/FreeOwnerDataMirOTRMenu"); - Menu_ConfigureObject(hMirOTRMenuObject, MCO_OPT_ONADD_SERVICE, "MIROTRMENUS/OnAddMenuItemMirOTRMenu"); // menu items CMenuItem mi(&g_plugin); diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index af6c8eb928..fd118f41d6 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -216,7 +216,7 @@ void ShowMessageInline(const MCONTACT hContact, const wchar_t *msg) T2Utf utf(buff); DB::EventInfo dbei; - dbei.timestamp = time(0); + dbei.iTimestamp = time(0); dbei.pBlob = utf; dbei.flags = PREF_BYPASS_OTR; ProtoChainRecvMsg(hContact, dbei); @@ -228,7 +228,7 @@ void ShowMessageInlineUtf(const MCONTACT hContact, const char *msg) mir_snprintf(buff, "%s%s", LANG_INLINE_PREFIX, msg); DB::EventInfo dbei; - dbei.timestamp = time(0); + dbei.iTimestamp = time(0); dbei.pBlob = buff; dbei.flags = PREF_BYPASS_OTR; ProtoChainRecvMsg(hContact, dbei); |