From 254179e128b577c8f929b38edab4e43fd6b4bffd Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 29 Dec 2014 02:17:20 +0000
Subject: Removed active and composing static functions

---
 src/chat_session.c | 77 +++++++++++++++++++-----------------------------------
 1 file changed, 27 insertions(+), 50 deletions(-)

diff --git a/src/chat_session.c b/src/chat_session.c
index 43b20806..d27a3449 100644
--- a/src/chat_session.c
+++ b/src/chat_session.c
@@ -65,26 +65,7 @@ typedef struct chat_session_t {
 
 static GHashTable *sessions;
 
-static ChatSession* _chat_session_new(const char * const barejid, gboolean supported);
-static void _chat_session_set_composing(const char * const barejid);
-static void _chat_session_set_active(const char * const barejid);
-static void _chat_session_free(ChatSession *session);
-
-void
-chat_sessions_init(void)
-{
-    sessions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-        (GDestroyNotify)_chat_session_free);
-}
-
-void
-chat_sessions_clear(void)
-{
-    if (sessions != NULL)
-        g_hash_table_remove_all(sessions);
-}
-
-ChatSession*
+static ChatSession*
 _chat_session_new(const char * const barejid, gboolean supported)
 {
     ChatSession *new_session = malloc(sizeof(struct chat_session_t));
@@ -99,29 +80,30 @@ _chat_session_new(const char * const barejid, gboolean supported)
 }
 
 static void
-_chat_session_set_composing(const char * const barejid)
+_chat_session_free(ChatSession *session)
 {
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-
     if (session != NULL) {
-        if (session->state != CHAT_STATE_COMPOSING) {
-            session->sent = FALSE;
+        free(session->barejid);
+        if (session->active_timer != NULL) {
+            g_timer_destroy(session->active_timer);
+            session->active_timer = NULL;
         }
-        session->state = CHAT_STATE_COMPOSING;
-        g_timer_start(session->active_timer);
+        free(session);
     }
 }
 
-static void
-_chat_session_set_active(const char * const barejid)
+void
+chat_sessions_init(void)
 {
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+    sessions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+        (GDestroyNotify)_chat_session_free);
+}
 
-    if (session != NULL) {
-        session->state = CHAT_STATE_ACTIVE;
-        g_timer_start(session->active_timer);
-        session->sent = TRUE;
-    }
+void
+chat_sessions_clear(void)
+{
+    if (sessions != NULL)
+        g_hash_table_remove_all(sessions);
 }
 
 gboolean
@@ -136,7 +118,9 @@ chat_session_on_message_send(const char * const barejid)
 
         }
         if (session->supported) {
-            _chat_session_set_active(barejid);
+            session->state = CHAT_STATE_ACTIVE;
+            g_timer_start(session->active_timer);
+            session->sent = TRUE;
             send_state = TRUE;
         }
     }
@@ -200,7 +184,13 @@ chat_session_on_activity(const char * const barejid)
     ChatSession *session = g_hash_table_lookup(sessions, barejid);
     if (session) {
         if (session->supported) {
-            _chat_session_set_composing(barejid);
+            if (session->state != CHAT_STATE_COMPOSING) {
+                session->sent = FALSE;
+            }
+
+            session->state = CHAT_STATE_COMPOSING;
+            g_timer_start(session->active_timer);
+
             if (!session->sent || session->state == CHAT_STATE_PAUSED) {
                 message_send_composing(barejid);
                 session->sent = TRUE;
@@ -250,17 +240,4 @@ chat_session_on_inactivity(const char * const barejid)
             }
         }
     }
-}
-
-static void
-_chat_session_free(ChatSession *session)
-{
-    if (session != NULL) {
-        free(session->barejid);
-        if (session->active_timer != NULL) {
-            g_timer_destroy(session->active_timer);
-            session->active_timer = NULL;
-        }
-        free(session);
-    }
 }
\ No newline at end of file
-- 
cgit 1.4.1-2-gfad0

'#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
</pre></td>
<td class='lines'><pre><code>