about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-10-27 23:15:28 +0000
committerJames Booth <boothj5@gmail.com>2015-10-27 23:15:28 +0000
commitea09dcda1850cb6fa29f9c1ca8efac870e033625 (patch)
tree106ae2fa99abb1b0c51f26503efbf16e1f3e3e54
parentdfd55d24cd06c151aeecaef442bfc94023826a2c (diff)
downloadprofani-tty-ea09dcda1850cb6fa29f9c1ca8efac870e033625.tar.gz
Renamed ui_new_chat_win -> chatwin_new
-rw-r--r--src/command/commands.c6
-rw-r--r--src/ui/chatwin.c4
-rw-r--r--src/ui/ui.h2
-rw-r--r--tests/unittests/ui/stub_ui.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/command/commands.c b/src/command/commands.c
index 5ff92321..799a006e 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1522,7 +1522,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args)
 
         ProfChatWin *chatwin = wins_get_chat(barejid);
         if (!chatwin) {
-            chatwin = ui_new_chat_win(barejid);
+            chatwin = chatwin_new(barejid);
         }
         ui_switch_win((ProfWin*)chatwin);
 
@@ -4665,7 +4665,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
 
             chatwin = wins_get_chat(barejid);
             if (!chatwin) {
-                chatwin = ui_new_chat_win(barejid);
+                chatwin = chatwin_new(barejid);
             }
             ui_switch_win((ProfWin*)chatwin);
         } else {
@@ -4866,7 +4866,7 @@ cmd_otr(ProfWin *window, const char *const command, gchar **args)
 
             ProfChatWin *chatwin = wins_get_chat(barejid);
             if (!chatwin) {
-                chatwin = ui_new_chat_win(barejid);
+                chatwin = chatwin_new(barejid);
             }
             ui_switch_win((ProfWin*)chatwin);
 
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index b3ea45b1..2ef35b10 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -198,7 +198,7 @@ chatwin_recipient_gone(ProfChatWin *chatwin)
 }
 
 ProfChatWin*
-ui_new_chat_win(const char *const barejid)
+chatwin_new(const char *const barejid)
 {
     ProfWin *window = wins_new_chat(barejid);
     ProfChatWin *chatwin = (ProfChatWin *)window;
@@ -294,7 +294,7 @@ ui_outgoing_chat_msg_carbon(const char *const barejid, const char *const message
 
     // create new window
     if (!chatwin) {
-        chatwin = ui_new_chat_win(barejid);
+        chatwin = chatwin_new(barejid);
     }
 
     chat_state_active(chatwin->state);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 5a7c8e1f..1214fdab 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -74,7 +74,7 @@ void ui_handle_otr_error(const char *const barejid, const char *const message);
 unsigned long ui_get_idle_time(void);
 void ui_reset_idle_time(void);
 ProfPrivateWin* ui_new_private_win(const char *const fulljid);
-ProfChatWin* ui_new_chat_win(const char *const barejid);
+ProfChatWin* chatwin_new(const char *const barejid);
 void ui_print_system_msg_from_recipient(const char *const barejid, const char *message);
 gint ui_unread(void);
 void ui_close_connected_win(int index);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index a486099e..0069ee8b 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -85,7 +85,7 @@ ProfPrivateWin* ui_new_private_win(const char * const fulljid)
     return NULL;
 }
 
-ProfChatWin* ui_new_chat_win(const char * const barejid)
+ProfChatWin* chatwin_new(const char * const barejid)
 {
     return NULL;
 }