3 files changed, 161 insertions, 0 deletions
diff --git a/src/chat_session.c b/src/chat_session.c
new file mode 100644
index 00000000..ff51b29d
--- /dev/null
+++ b/src/chat_session.c
@@ -0,0 +1,112 @@
+/* 
+ * chat_session.c
+ *
+ * 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "chat_session.h"
+
+static ChatSession _chat_session_new(char *recipient);
+static void _chat_session_free(ChatSession session);
+
+struct chat_session_t {
+    char *recipient;
+    chat_state_t state;
+    gboolean sent;
+};
+
+static GHashTable *sessions;
+
+void
+chat_session_init(void)
+{
+    sessions = g_hash_table_new_full(NULL, g_str_equal, g_free, 
+        (GDestroyNotify)_chat_session_free);
+}
+
+void
+chat_session_start(char *recipient)
+{
+    ChatSession session = _chat_session_new(recipient);
+    g_hash_table_insert(sessions, recipient, session);
+}
+
+void
+chat_session_end(char *recipient)
+{
+    g_hash_table_remove(sessions, recipient);
+}
+
+chat_state_t
+chat_session_get_state(char *recipient)
+{
+    ChatSession session = g_hash_table_lookup(sessions, recipient);
+    if (session == NULL) {
+        return SESSION_ERR;
+    } else {
+        return session->state;
+    }
+}
+
+void
+chat_session_set_state(char *recipient, chat_state_t state)
+{
+    ChatSession session = g_hash_table_lookup(sessions, recipient);
+    session->state = state;
+}
+
+gboolean
+chat_session_get_sent(char *recipient)
+{
+    ChatSession session = g_hash_table_lookup(sessions, recipient);
+    return session->sent;
+}
+
+void
+chat_session_sent(char *recipient)
+{
+    ChatSession session = g_hash_table_lookup(sessions, recipient);
+    session->sent = TRUE;
+}
+
+static ChatSession
+_chat_session_new(char *recipient)
+{
+    ChatSession new_session = malloc(sizeof(struct chat_session_t));
+    new_session->recipient = malloc(strlen(recipient) + 1);
+    strcpy(new_session->recipient, recipient);
+    new_session->state = ACTIVE;
+    new_session->sent = FALSE;
+    
+    return new_session;
+}
+
+static void
+_chat_session_free(ChatSession session)
+{
+    if (session != NULL) {
+        g_free(session->recipient);
+        g_free(session);
+    }
+}
diff --git a/src/chat_session.h b/src/chat_session.h
new file mode 100644
index 00000000..8c0d9048
--- /dev/null
+++ b/src/chat_session.h
@@ -0,0 +1,47 @@
+/* 
+ * 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CHAT_SESSION_H
+#define CHAT_SESSION_H
+
+#include <glib.h>
+
+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(char *recipient);
+void chat_session_end(char *recipient);
+chat_state_t chat_session_get_state(char *recipient);
+void chat_session_set_state(char *recipient, chat_state_t state);
+gboolean chat_session_get_sent(char *recipient);
+void chat_session_sent(char *recipient);
+
+#endif
diff --git a/src/profanity.c b/src/profanity.c
index 249268a5..cdb084bf 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -89,6 +89,8 @@ prof_run(const int disable_tls, char *log_level)
         inp[size++] = '\0';
         cmd_result = _process_input(inp);
     }
+
+    g_timer_destroy(timer);
 }
 
 void