diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-28 18:22:40 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-28 18:22:40 +0000 |
| commit | 56ac6b6b49cd5785ce5fb14dc63e776b4b3da07a (patch) | |
| tree | 7f0b1eeaa437cf2ecd31f69add3242007f46ae3b /protocols/JabberG/src/jabber_menu.cpp | |
| parent | 00c6c10291bf7f86e871b648e8dd003a0a16c8e5 (diff) | |
- Google specific functionality got moved to GTalkExt, part I;
- new event for extensions list creation, ME_JABBER_EXTLISTINIT
git-svn-id: http://svn.miranda-ng.org/main/trunk@6260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_menu.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index c8b96559b2..4c27ddf361 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -49,11 +49,12 @@ static HGENMENU g_hMenuResourcesRoot; static HGENMENU g_hMenuResourcesActive;
static HGENMENU g_hMenuResourcesServer;
-static struct
+struct
{
int icon;
int mode;
-} PresenceModeArray[] =
+}
+static PresenceModeArray[] =
{
{ SKINICON_STATUS_ONLINE, ID_STATUS_ONLINE },
{ SKINICON_STATUS_AWAY, ID_STATUS_AWAY },
@@ -813,7 +814,7 @@ void CJabberProto::MenuInit() m_pepServices.RebuildMenu();
CheckMenuItems();
- NotifyFastHook(hStatusMenuInit, (WPARAM)hJabberRoot, (LPARAM)this);
+ NotifyFastHook(hStatusMenuInit, (WPARAM)hJabberRoot, (LPARAM)(IJabberInterface*)this);
}
//////////////////////////////////////////////////////////////////////////
@@ -1194,6 +1195,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleDirectPresence(WPARAM wParam, LPARAM l ////////////////////////////////////////////////////////////////////////
// Choose protocol instance
+
CJabberProto *JabberChooseInstance(bool bIsLink)
{
if (g_Instances.getCount() == 0)
|