Merge branch 'master' into chatstates

Conflicts:
	Makefile.am
This commit is contained in:
James Booth
2012-10-30 01:38:08 +00:00
16 changed files with 507 additions and 740 deletions

View File

@@ -1,8 +1,8 @@
/*
/*
* chat_session.h
*
* Copyright (C) 2012 James Booth <boothj5@gmail.com>
*
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
@@ -27,21 +27,11 @@
typedef struct chat_session_t *ChatSession;
typedef enum {
ACTIVE,
INACTIVE,
GONE,
COMPOSING,
PAUSED,
SESSION_ERR
} chat_state_t;
void chat_session_init(void);
void chat_session_start(const char * const recipient);
void chat_sessions_init(void);
void chat_sessions_clear(void);
void chat_session_start(const char * const recipient,
gboolean recipient_supports);
void chat_session_end(const char * const recipient);
chat_state_t chat_session_get_state(const char * const recipient);
void chat_session_set_state(const char * const recipient, chat_state_t state);
gboolean chat_session_get_sent(const char * const recipient);
void chat_session_sent(const char * const recipient);
gboolean chat_session_recipient_supports(const char * const recipient);
#endif