about summary refs log tree commit diff stats
path: root/src/otr/otrlibv3.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-10-27 21:23:56 +0000
committerJames Booth <boothj5@gmail.com>2015-10-27 21:23:56 +0000
commit40dcd597270c375ff2d0abc36554f6436f406a03 (patch)
tree49f3a6e07da36c0b1a8e5f7e99c40085b58d374d /src/otr/otrlibv3.c
parent0fd616167ee86562077327695f5f32974e9f5578 (diff)
downloadprofani-tty-40dcd597270c375ff2d0abc36554f6436f406a03.tar.gz
Renamed chatwin OTR functions
Diffstat (limited to 'src/otr/otrlibv3.c')
-rw-r--r--src/otr/otrlibv3.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/otr/otrlibv3.c b/src/otr/otrlibv3.c
index c32bd239..8fa89a26 100644
--- a/src/otr/otrlibv3.c
+++ b/src/otr/otrlibv3.c
@@ -143,7 +143,7 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
         } else {
             ProfChatWin *chatwin = wins_get_chat(context->username);
             if (chatwin) {
-                ui_smp_recipient_initiated(chatwin);
+                chatwin_otr_smp_init(chatwin);
             }
             g_hash_table_insert(smp_initiators, strdup(context->username), strdup(context->username));
         }
@@ -158,7 +158,7 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
                 char *question = (char *)tlv->data;
                 char *eoq = memchr(question, '\0', tlv->len);
                 if (eoq) {
-                    ui_smp_recipient_initiated_q(chatwin, question);
+                    chatwin_otr_smp_init_q(chatwin, question);
                 }
             }
         }
@@ -181,17 +181,17 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
             if (chatwin) {
                 if (context->smstate->received_question == 0) {
                     if (context->active_fingerprint->trust && (context->active_fingerprint->trust[0] != '\0')) {
-                        ui_smp_successful(chatwin);
-                        ui_trust(chatwin);
+                        chatwin_otr_smp_success(chatwin);
+                        chatwin_otr_trust(chatwin);
                     } else {
-                        ui_smp_unsuccessful_sender(chatwin);
-                        ui_untrust(chatwin);
+                        chatwin_otr_smp_sender_failed(chatwin);
+                        chatwin_otr_untrust(chatwin);
                     }
                 } else {
                     if (context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
-                        ui_smp_answer_success(chatwin);
+                        chatwin_otr_smp_answer_success(chatwin);
                     } else {
-                        ui_smp_answer_failure(chatwin);
+                        chatwin_otr_smp_answer_failure(chatwin);
                     }
                 }
             }
@@ -206,11 +206,11 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
             ProfChatWin *chatwin = wins_get_chat(context->username);
             if (chatwin) {
                 if (context->active_fingerprint->trust && (context->active_fingerprint->trust[0] != '\0')) {
-                    ui_smp_successful(chatwin);
-                    ui_trust(chatwin);
+                    chatwin_otr_smp_success(chatwin);
+                    chatwin_otr_trust(chatwin);
                 } else {
-                    ui_smp_unsuccessful_receiver(chatwin);
-                    ui_untrust(chatwin);
+                    chatwin_otr_smp_receiver_failed(chatwin);
+                    chatwin_otr_untrust(chatwin);
                 }
             }
         }
@@ -220,8 +220,8 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
         context->smstate->nextExpected = OTRL_SMP_EXPECT1;
         ProfChatWin *chatwin = wins_get_chat(context->username);
         if (chatwin) {
-            ui_smp_aborted(chatwin);
-            ui_untrust(chatwin);
+            chatwin_otr_smp_aborted(chatwin);
+            chatwin_otr_untrust(chatwin);
         }
         otr_untrust(context->username);
     }