summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/m_addcontact.h6
-rw-r--r--include/m_avatars.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/include/m_addcontact.h b/include/m_addcontact.h
index 383d9e48e8..b4dad7f90c 100644
--- a/include/m_addcontact.h
+++ b/include/m_addcontact.h
@@ -27,7 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
typedef struct{
int handleType; // one of the HANDLE_ constants
- HANDLE handle; // hDbEvent if acs.handleType == HANDLE_EVENT, hContact if acs.handleType == HANDLE_CONTACT, ignored if acs.handleType == HANDLE_SEARCHRESULT
+ union {
+ HANDLE hDbEvent; // hDbEvent if acs.handleType == HANDLE_EVENT
+ HCONTACT hContact; // hContact if acs.handleType == HANDLE_CONTACT
+ // ignored if acs.handleType == HANDLE_SEARCHRESULT
+ };
const char *szProto; // ignored if acs.handleType != HANDLE_SEARCHRESULT
PROTOSEARCHRESULT *psr; // ignored if acs.handleType != HANDLE_SEARCHRESULT
}ADDCONTACTSTRUCT;
diff --git a/include/m_avatars.h b/include/m_avatars.h
index ce1e6eab69..1b03a3f33b 100644
--- a/include/m_avatars.h
+++ b/include/m_avatars.h
@@ -101,7 +101,7 @@ typedef struct avatarCacheEntry {
typedef struct _avatarDrawRequest {
DWORD cbSize; // set this to sizeof(AVATARDRAWREQUEST) - mandatory, service will return failure code if
// cbSize is wrong
- HANDLE hContact; // the contact for which the avatar should be drawn. set it to 0 to draw a protocol picture
+ HCONTACT hContact; // the contact for which the avatar should be drawn. set it to 0 to draw a protocol picture
HDC hTargetDC; // target device context
RECT rcDraw; // target rectangle. The avatar will be centered within the rectangle and scaled to fit.
DWORD dwFlags; // flags (see above for valid bitflags)
@@ -212,7 +212,7 @@ typedef struct _avatarDrawRequest {
typedef struct _contactAvatarChangedNotification {
int cbSize; // sizeof()
- HANDLE hContact; // this might have to be set by the caller too
+ HCONTACT hContact; // this might have to be set by the caller too
int format; // PA_FORMAT_*
TCHAR filename[MAX_PATH]; // full path to filename which contains the avatar
TCHAR hash[128]; // avatar hash