Merge branch 'master' into chatstates

Conflicts:
	Makefile.am

1 files changed, 7 insertions, 17 deletions

diff --git a/src/chat_session.h b/src/chat_session.h
index b17fb2ee..aecc47da 100644
--- a/src/chat_session.h
+++ b/src/chat_session.h
@@ -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