Applied coding style to src/ui/

10 files changed, 191 insertions, 192 deletions

diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 43e2a3a7..8faa2082 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -129,7 +129,7 @@ create_input_window(void)
     _inp_win_update_virtual();
 }
 
-char *
+char*
 inp_readline(void)
 {
     free(inp_line);
@@ -225,7 +225,7 @@ inp_close(void)
     rl_callback_handler_remove();
 }
 
-char *
+char*
 inp_get_line(void)
 {
     werase(inp_win);
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 4f732e67..25faba38 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -47,6 +47,6 @@ void inp_win_clear(void);
 void inp_win_resize(void);
 void inp_put_back(void);
 char* inp_get_password(void);
-char * inp_get_line(void);
+char* inp_get_line(void);
 
 #endif
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index 12367190..3c24324f 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -51,7 +51,7 @@
 #include "window_list.h"
 #include "config/preferences.h"
 
-static void _notify(const char * const message, int timeout, const char * const category);
+static void _notify(const char *const message, int timeout, const char *const category);
 
 static GTimer *remind_timer;
 
@@ -73,7 +73,7 @@ notifier_uninit(void)
 }
 
 void
-notify_typing(const char * const handle)
+notify_typing(const char *const handle)
 {
     char message[strlen(handle) + 1 + 11];
     sprintf(message, "%s: typing...", handle);
@@ -82,8 +82,8 @@ notify_typing(const char * const handle)
 }
 
 void
-notify_invite(const char * const from, const char * const room,
-    const char * const reason)
+notify_invite(const char *const from, const char *const room,
+    const char *const reason)
 {
     GString *message = g_string_new("Room invite\nfrom: ");
     g_string_append(message, from);
@@ -99,7 +99,7 @@ notify_invite(const char * const from, const char * const room,
 }
 
 void
-notify_message(ProfWin *window, const char * const name, const char * const text)
+notify_message(ProfWin *window, const char *const name, const char *const text)
 {
     int num = wins_get_num(window);
     if (num == 10) {
@@ -121,7 +121,7 @@ notify_message(ProfWin *window, const char * const name, const char * const text
 }
 
 void
-notify_room_message(const char * const handle, const char * const room, int win, const char * const text)
+notify_room_message(const char *const handle, const char *const room, int win, const char *const text)
 {
     GString *message = g_string_new("");
     g_string_append_printf(message, "%s in %s (win %d)", handle, room, win);
@@ -135,7 +135,7 @@ notify_room_message(const char * const handle, const char * const room, int win,
 }
 
 void
-notify_subscription(const char * const from)
+notify_subscription(const char *const from)
 {
     GString *message = g_string_new("Subscription request: \n");
     g_string_append(message, from);
@@ -195,8 +195,7 @@ notify_remind(void)
 }
 
 static void
-_notify(const char * const message, int timeout,
-    const char * const category)
+_notify(const char *const message, int timeout, const char *const category)
 {
 #ifdef HAVE_LIBNOTIFY
     log_debug("Attempting notification: %s", message);
diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c
index fe4a600c..36447437 100644
--- a/src/ui/occupantswin.c
+++ b/src/ui/occupantswin.c
@@ -62,7 +62,7 @@ _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean sh
 }
 
 void
-occupantswin_occupants(const char * const roomjid)
+occupantswin_occupants(const char *const roomjid)
 {
     ProfMucWin *mucwin = wins_get_muc(roomjid);
     if (mucwin) {
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index e48be866..d7d4012d 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -82,7 +82,7 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact)
 }
 
 static void
-_rosterwin_contacts_by_presence(ProfLayoutSplit *layout, const char * const presence, char *title)
+_rosterwin_contacts_by_presence(ProfLayoutSplit *layout, const char *const presence, char *title)
 {
     GSList *contacts = roster_get_contacts_by_presence(presence);
 
diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
index 47aa1b1a..5156aae2 100644
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -304,7 +304,7 @@ status_bar_get_password(void)
 }
 
 void
-status_bar_print_message(const char * const msg)
+status_bar_print_message(const char *const msg)
 {
     werase(status_bar);
 
diff --git a/src/ui/statusbar.h b/src/ui/statusbar.h
index c37f43f3..d014274e 100644
--- a/src/ui/statusbar.h
+++ b/src/ui/statusbar.h
@@ -41,7 +41,7 @@ void status_bar_resize(void);
 void status_bar_clear(void);
 void status_bar_clear_message(void);
 void status_bar_get_password(void);
-void status_bar_print_message(const char * const msg);
+void status_bar_print_message(const char *const msg);
 void status_bar_current(int i);
 
 #endif
diff --git a/src/ui/ui.h b/src/ui/ui.h
index b7c7a8ae..16bdfa0b 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -62,146 +62,146 @@ GSList* ui_get_chat_recipients(void);
 void ui_switch_win(ProfWin *window);
 void ui_sigwinch_handler(int sig);
 
-void ui_gone_secure(const char * const barejid, gboolean trusted);
-void ui_gone_insecure(const char * const barejid);
-void ui_trust(const char * const barejid);
-void ui_untrust(const char * const barejid);
-void ui_smp_recipient_initiated(const char * const barejid);
-void ui_smp_recipient_initiated_q(const char * const barejid, const char *question);
+void ui_gone_secure(const char *const barejid, gboolean trusted);
+void ui_gone_insecure(const char *const barejid);
+void ui_trust(const char *const barejid);
+void ui_untrust(const char *const barejid);
+void ui_smp_recipient_initiated(const char *const barejid);
+void ui_smp_recipient_initiated_q(const char *const barejid, const char *question);
 
-void ui_smp_successful(const char * const barejid);
-void ui_smp_unsuccessful_sender(const char * const barejid);
-void ui_smp_unsuccessful_receiver(const char * const barejid);
-void ui_smp_aborted(const char * const barejid);
+void ui_smp_successful(const char *const barejid);
+void ui_smp_unsuccessful_sender(const char *const barejid);
+void ui_smp_unsuccessful_receiver(const char *const barejid);
+void ui_smp_aborted(const char *const barejid);
 
-void ui_smp_answer_success(const char * const barejid);
-void ui_smp_answer_failure(const char * const barejid);
+void ui_smp_answer_success(const char *const barejid);
+void ui_smp_answer_failure(const char *const barejid);
 
-void ui_otr_authenticating(const char * const barejid);
-void ui_otr_authetication_waiting(const char * const recipient);
+void ui_otr_authenticating(const char *const barejid);
+void ui_otr_authetication_waiting(const char *const recipient);
 
-void ui_handle_otr_error(const char * const barejid, const char * const message);
+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);
-void ui_print_system_msg_from_recipient(const char * const barejid, const char *message);
+ProfPrivateWin* ui_new_private_win(const char *const fulljid);
+ProfChatWin* ui_new_chat_win(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);
 int ui_close_all_wins(void);
 int ui_close_read_wins(void);
 
 // current window actions
-void ui_current_print_line(const char * const msg, ...);
-void ui_current_print_formatted_line(const char show_char, int attrs, const char * const msg, ...);
-void ui_current_error_line(const char * const msg);
-void ui_win_error_line(ProfWin *window, const char * const msg);
+void ui_current_print_line(const char *const msg, ...);
+void ui_current_print_formatted_line(const char show_char, int attrs, const char *const msg, ...);
+void ui_current_error_line(const char *const msg);
+void ui_win_error_line(ProfWin *window, const char *const msg);
 
 win_type_t ui_win_type(int index);
 void ui_close_win(int index);
 int ui_win_unread(int index);
-char * ui_ask_password(void);
-char * ui_get_line(void);
-char * ui_ask_pgp_passphrase(const char *hint, int prev_fail);
+char* ui_ask_password(void);
+char* ui_get_line(void);
+char* ui_ask_pgp_passphrase(const char *hint, int prev_fail);
 
-void ui_handle_stanza(const char * const msg);
+void ui_handle_stanza(const char *const msg);
 
 // ui events
 void ui_contact_online(char *barejid, Resource *resource, GDateTime *last_activity);
-void ui_contact_typing(const char * const barejid, const char * const resource);
-void ui_incoming_msg(ProfChatWin *chatwin, const char * const resource,  const char * const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
-void ui_incoming_private_msg(const char * const fulljid, const char * const message, GDateTime *timestamp);
-void ui_message_receipt(const char * const barejid, const char * const id);
+void ui_contact_typing(const char *const barejid, const char *const resource);
+void ui_incoming_msg(ProfChatWin *chatwin, const char *const resource,  const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
+void ui_incoming_private_msg(const char *const fulljid, const char *const message, GDateTime *timestamp);
+void ui_message_receipt(const char *const barejid, const char *const id);
 
 void ui_disconnected(void);
-void ui_recipient_gone(const char * const barejid, const char * const resource);
-
-void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char * const message, char *id, prof_enc_t enc_mode);
-void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message);
-void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char * const message);
-
-void ui_room_join(const char * const roomjid, gboolean focus);
-void ui_switch_to_room(const char * const roomjid);
-
-void ui_room_role_change(const char * const roomjid, const char * const role, const char * const actor,
-    const char * const reason);
-void ui_room_affiliation_change(const char * const roomjid, const char * const affiliation, const char * const actor,
-    const char * const reason);
-void ui_room_role_and_affiliation_change(const char * const roomjid, const char * const role,
-    const char * const affiliation, const char * const actor, const char * const reason);
-void ui_room_occupant_role_change(const char * const roomjid, const char * const nick, const char * const role,
-    const char * const actor, const char * const reason);
-void ui_room_occupant_affiliation_change(const char * const roomjid, const char * const nick, const char * const affiliation,
-    const char * const actor, const char * const reason);
-void ui_room_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role,
-    const char * const affiliation, const char * const actor, const char * const reason);
-void ui_room_roster(const char * const roomjid, GList *occupants, const char * const presence);
-void ui_room_history(const char * const roomjid, const char * const nick,
-    GDateTime *timestamp, const char * const message);
-void ui_room_message(const char * const roomjid, const char * const nick,
-    const char * const message);
-void ui_room_subject(const char * const roomjid, const char * const nick, const char * const subject);
-void ui_room_requires_config(const char * const roomjid);
-void ui_room_destroy(const char * const roomjid);
+void ui_recipient_gone(const char *const barejid, const char *const resource);
+
+void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
+void ui_outgoing_chat_msg_carbon(const char *const barejid, const char *const message);
+void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char *const message);
+
+void ui_room_join(const char *const roomjid, gboolean focus);
+void ui_switch_to_room(const char *const roomjid);
+
+void ui_room_role_change(const char *const roomjid, const char *const role, const char *const actor,
+    const char *const reason);
+void ui_room_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
+    const char *const reason);
+void ui_room_role_and_affiliation_change(const char *const roomjid, const char *const role,
+    const char *const affiliation, const char *const actor, const char *const reason);
+void ui_room_occupant_role_change(const char *const roomjid, const char *const nick, const char *const role,
+    const char *const actor, const char *const reason);
+void ui_room_occupant_affiliation_change(const char *const roomjid, const char *const nick, const char *const affiliation,
+    const char *const actor, const char *const reason);
+void ui_room_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick, const char *const role,
+    const char *const affiliation, const char *const actor, const char *const reason);
+void ui_room_roster(const char *const roomjid, GList *occupants, const char *const presence);
+void ui_room_history(const char *const roomjid, const char *const nick,
+    GDateTime *timestamp, const char *const message);
+void ui_room_message(const char *const roomjid, const char *const nick,
+    const char *const message);
+void ui_room_subject(const char *const roomjid, const char *const nick, const char *const subject);
+void ui_room_requires_config(const char *const roomjid);
+void ui_room_destroy(const char *const roomjid);
 void ui_show_room_info(ProfMucWin *mucwin);
 void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role);
 void ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation);
-void ui_handle_room_info_error(const char * const roomjid, const char * const error);
-void ui_show_room_disco_info(const char * const roomjid, GSList *identities, GSList *features);
-void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid,
-    const char * const password);
-void ui_room_kicked(const char * const roomjid, const char * const actor, const char * const reason);
-void ui_room_member_kicked(const char * const roomjid, const char * const nick, const char * const actor,
-    const char * const reason);
-void ui_room_banned(const char * const roomjid, const char * const actor, const char * const reason);
-void ui_room_member_banned(const char * const roomjid, const char * const nick, const char * const actor,
-    const char * const reason);
-void ui_leave_room(const char * const roomjid);
-void ui_room_broadcast(const char * const roomjid,
-    const char * const message);
-void ui_room_member_offline(const char * const roomjid, const char * const nick);
-void ui_room_member_online(const char * const roomjid, const char * const nick, const char * const roles,
-    const char * const affiliation, const char * const show, const char * const status);
-void ui_room_member_nick_change(const char * const roomjid,
-    const char * const old_nick, const char * const nick);
-void ui_room_nick_change(const char * const roomjid, const char * const nick);
-void ui_room_member_presence(const char * const roomjid,
-    const char * const nick, const char * const show, const char * const status);
-void ui_room_update_occupants(const char * const roomjid);
-void ui_room_show_occupants(const char * const roomjid);
-void ui_room_hide_occupants(const char * const roomjid);
+void ui_handle_room_info_error(const char *const roomjid, const char *const error);
+void ui_show_room_disco_info(const char *const roomjid, GSList *identities, GSList *features);
+void ui_room_destroyed(const char *const roomjid, const char *const reason, const char *const new_jid,
+    const char *const password);
+void ui_room_kicked(const char *const roomjid, const char *const actor, const char *const reason);
+void ui_room_member_kicked(const char *const roomjid, const char *const nick, const char *const actor,
+    const char *const reason);
+void ui_room_banned(const char *const roomjid, const char *const actor, const char *const reason);
+void ui_room_member_banned(const char *const roomjid, const char *const nick, const char *const actor,
+    const char *const reason);
+void ui_leave_room(const char *const roomjid);
+void ui_room_broadcast(const char *const roomjid,
+    const char *const message);
+void ui_room_member_offline(const char *const roomjid, const char *const nick);
+void ui_room_member_online(const char *const roomjid, const char *const nick, const char *const roles,
+    const char *const affiliation, const char *const show, const char *const status);
+void ui_room_member_nick_change(const char *const roomjid,
+    const char *const old_nick, const char *const nick);
+void ui_room_nick_change(const char *const roomjid, const char *const nick);
+void ui_room_member_presence(const char *const roomjid,
+    const char *const nick, const char *const show, const char *const status);
+void ui_room_update_occupants(const char *const roomjid);
+void ui_room_show_occupants(const char *const roomjid);
+void ui_room_hide_occupants(const char *const roomjid);
 void ui_show_roster(void);
 void ui_hide_roster(void);
-void ui_roster_add(const char * const barejid, const char * const name);
-void ui_roster_remove(const char * const barejid);
-void ui_contact_already_in_group(const char * const contact, const char * const group);
-void ui_contact_not_in_group(const char * const contact, const char * const group);
-void ui_group_added(const char * const contact, const char * const group);
-void ui_group_removed(const char * const contact, const char * const group);
+void ui_roster_add(const char *const barejid, const char *const name);
+void ui_roster_remove(const char *const barejid);
+void ui_contact_already_in_group(const char *const contact, const char *const group);
+void ui_contact_not_in_group(const char *const contact, const char *const group);
+void ui_group_added(const char *const contact, const char *const group);
+void ui_group_removed(const char *const contact, const char *const group);
 void ui_chat_win_contact_online(PContact contact, Resource *resource, GDateTime *last_activity);
 void ui_chat_win_contact_offline(PContact contact, char *resource, char *status);
 void ui_contact_offline(char *barejid, char *resource, char *status);
-void ui_handle_recipient_not_found(const char * const recipient, const char * const err_msg);
-void ui_handle_recipient_error(const char * const recipient, const char * const err_msg);
-void ui_handle_error(const char * const err_msg);
+void ui_handle_recipient_not_found(const char *const recipient, const char *const err_msg);
+void ui_handle_recipient_error(const char *const recipient, const char *const err_msg);
+void ui_handle_error(const char *const err_msg);
 void ui_clear_win_title(void);
 void ui_goodbye_title(void);
-void ui_handle_room_join_error(const char * const roomjid, const char * const err);
-void ui_handle_room_configuration(const char * const roomjid, DataForm *form);
-void ui_handle_room_configuration_form_error(const char * const roomjid, const char * const message);
-void ui_handle_room_config_submit_result(const char * const roomjid);
-void ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message);
-void ui_handle_room_affiliation_list_error(const char * const roomjid, const char * const affiliation,
-    const char * const error);
-void ui_handle_room_affiliation_list(const char * const roomjid, const char * const affiliation, GSList *jids);
-void ui_handle_room_affiliation_set_error(const char * const roomjid, const char * const jid,
-    const char * const affiliation, const char * const error);
-void ui_handle_room_role_set_error(const char * const roomjid, const char * const nick, const char * const role,
-    const char * const error);
-void ui_handle_room_role_list_error(const char * const roomjid, const char * const role, const char * const error);
-void ui_handle_room_role_list(const char * const roomjid, const char * const role, GSList *nicks);
-void ui_handle_room_kick_error(const char * const roomjid, const char * const nick, const char * const error);
+void ui_handle_room_join_error(const char *const roomjid, const char *const err);
+void ui_handle_room_configuration(const char *const roomjid, DataForm *form);
+void ui_handle_room_configuration_form_error(const char *const roomjid, const char *const message);
+void ui_handle_room_config_submit_result(const char *const roomjid);
+void ui_handle_room_config_submit_result_error(const char *const roomjid, const char *const message);
+void ui_handle_room_affiliation_list_error(const char *const roomjid, const char *const affiliation,
+    const char *const error);
+void ui_handle_room_affiliation_list(const char *const roomjid, const char *const affiliation, GSList *jids);
+void ui_handle_room_affiliation_set_error(const char *const roomjid, const char *const jid,
+    const char *const affiliation, const char *const error);
+void ui_handle_room_role_set_error(const char *const roomjid, const char *const nick, const char *const role,
+    const char *const error);
+void ui_handle_room_role_list_error(const char *const roomjid, const char *const role, const char *const error);
+void ui_handle_room_role_list(const char *const roomjid, const char *const role, GSList *nicks);
+void ui_handle_room_kick_error(const char *const roomjid, const char *const nick, const char *const error);
 void ui_show_form(ProfMucConfWin *confwin);
 void ui_show_form_field(ProfWin *window, DataForm *form, char *tag);
 void ui_show_form_help(ProfMucConfWin *confwin);
@@ -210,10 +210,10 @@ void ui_show_lines(ProfWin *window, const gchar** lines);
 void ui_redraw_all_room_rosters(void);
 void ui_show_all_room_rosters(void);
 void ui_hide_all_room_rosters(void);
-gboolean ui_chat_win_exists(const char * const barejid);
-void ui_handle_software_version_error(const char * const roomjid, const char * const message);
-void ui_show_software_version(const char * const jid, const char * const  presence,
-    const char * const name, const char * const version, const char * const os);
+gboolean ui_chat_win_exists(const char *const barejid);
+void ui_handle_software_version_error(const char *const roomjid, const char *const message);
+void ui_show_software_version(const char *const jid, const char *const  presence,
+    const char *const name, const char *const version, const char *const os);
 
 gboolean ui_tidy_wins(void);
 void ui_prune_wins(void);
@@ -229,7 +229,7 @@ void ui_auto_away(char *message, gint time, resource_presence_t res_presence);
 void ui_titlebar_presence(contact_presence_t presence);
 void ui_handle_login_account_success(ProfAccount *account, int secured);
 void ui_update_presence(const resource_presence_t resource_presence,
-    const char * const message, const char * const show);
+    const char *const message, const char *const show);
 void ui_about(void);
 void ui_statusbar_new(const int win);
 
@@ -238,7 +238,7 @@ void ui_input_clear(void);
 void ui_input_nonblocking(gboolean);
 void ui_write(char *line, int offset);
 
-void ui_invalid_command_usage(const char * const cmd, void (*setting_func)(void));
+void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void));
 
 void ui_create_xmlconsole_win(void);
 gboolean ui_xmlconsole_exists(void);
@@ -249,12 +249,12 @@ gboolean ui_win_has_unsaved_form(int num);
 void ui_inp_history_append(char *inp);
 
 // console window actions
-void cons_show(const char * const msg, ...);
-void cons_show_padded(int pad, const char * const msg, ...);
+void cons_show(const char *const msg, ...);
+void cons_show_padded(int pad, const char *const msg, ...);
 void cons_about(void);
 void cons_help(void);
 void cons_show_help(Command *command);
-void cons_bad_cmd_usage(const char * const cmd);
+void cons_bad_cmd_usage(const char *const cmd);
 void cons_navigation_help(void);
 void cons_prefs(void);
 void cons_show_ui_prefs(void);
@@ -266,35 +266,35 @@ void cons_show_connection_prefs(void);
 void cons_show_otr_prefs(void);
 void cons_show_pgp_prefs(void);
 void cons_show_account(ProfAccount *account);
-void cons_debug(const char * const msg, ...);
+void cons_debug(const char *const msg, ...);
 void cons_show_time(void);
-void cons_show_word(const char * const word);
-void cons_show_error(const char * const cmd, ...);
-void cons_show_contacts(GSList * list);
-void cons_show_roster(GSList * list);
-void cons_show_roster_group(const char * const group, GSList * list);
+void cons_show_word(const char *const word);
+void cons_show_error(const char *const cmd, ...);
+void cons_show_contacts(GSList *list);
+void cons_show_roster(GSList *list);
+void cons_show_roster_group(const char *const group, GSList *list);
 void cons_show_wins(void);
-void cons_show_status(const char * const barejid);
+void cons_show_status(const char *const barejid);
 void cons_show_info(PContact pcontact);
-void cons_show_caps(const char * const fulljid, resource_presence_t presence);
+void cons_show_caps(const char *const fulljid, resource_presence_t presence);
 void cons_show_themes(GSList *themes);
 void cons_show_scripts(GSList *scripts);
 void cons_show_script(const char *const script, GSList *commands);
 void cons_show_aliases(GList *aliases);
 void cons_show_login_success(ProfAccount *account, int secured);
-void cons_show_software_version(const char * const jid,
-    const char * const presence, const char * const name,
-    const char * const version, const char * const os);
+void cons_show_software_version(const char *const jid,
+    const char *const presence, const char *const name,
+    const char *const version, const char *const os);
 void cons_show_account_list(gchar **accounts);
-void cons_show_room_list(GSList *room, const char * const conference_node);
+void cons_show_room_list(GSList *room, const char *const conference_node);
 void cons_show_bookmarks(const GList *list);
-void cons_show_disco_items(GSList *items, const char * const jid);
+void cons_show_disco_items(GSList *items, const char *const jid);
 void cons_show_disco_info(const char *from, GSList *identities, GSList *features);
-void cons_show_room_invite(const char * const invitor, const char * const room,
-    const char * const reason);
+void cons_show_room_invite(const char *const invitor, const char *const room,
+    const char *const reason);
 void cons_check_version(gboolean not_available_msg);
-void cons_show_typing(const char * const barejid);
-void cons_show_incoming_message(const char * const short_from, const int win_index);
+void cons_show_typing(const char *const barejid);
+void cons_show_incoming_message(const char *const short_from, const int win_index);
 void cons_show_room_invites(GSList *invites);
 void cons_show_received_subs(void);
 void cons_show_sent_subs(void);
@@ -348,15 +348,15 @@ void status_bar_set_all_inactive(void);
 void rosterwin_roster(void);
 
 // occupants window
-void occupantswin_occupants(const char * const room);
+void occupantswin_occupants(const char *const room);
 
 // window interface
 ProfWin* win_create_console(void);
 ProfWin* win_create_xmlconsole(void);
-ProfWin* win_create_chat(const char * const barejid);
-ProfWin* win_create_muc(const char * const roomjid);
-ProfWin* win_create_muc_config(const char * const title, DataForm *form);
-ProfWin* win_create_private(const char * const fulljid);
+ProfWin* win_create_chat(const char *const barejid);
+ProfWin* win_create_muc(const char *const roomjid);
+ProfWin* win_create_muc_config(const char *const title, DataForm *form);
+ProfWin* win_create_private(const char *const fulljid);
 
 void win_update_virtual(ProfWin *window);
 void win_free(ProfWin *window);
@@ -366,26 +366,26 @@ void win_hide_subwin(ProfWin *window);
 void win_show_subwin(ProfWin *window);
 void win_refresh_without_subwin(ProfWin *window);
 void win_refresh_with_subwin(ProfWin *window);
-void win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp, int flags, theme_item_t theme_item, const char * const from, const char * const message);
-void win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...);
+void win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp, int flags, theme_item_t theme_item, const char *const from, const char *const message);
+void win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp, int flags, theme_item_t theme_item, const char *const from, const char *const message, ...);
 char* win_get_title(ProfWin *window);
 void win_show_occupant(ProfWin *window, Occupant *occupant);
-void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occupant);
+void win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupant);
 void win_show_contact(ProfWin *window, PContact contact);
 void win_show_info(ProfWin *window, PContact contact);
-void win_println(ProfWin *window, int pad, const char * const message);
+void win_println(ProfWin *window, int pad, const char *const message);
 
 // desktop notifier actions
 void notifier_initialise(void);
 void notifier_uninit(void);
 
-void notify_typing(const char * const handle);
-void notify_message(ProfWin *window, const char * const name, const char * const text);
-void notify_room_message(const char * const handle, const char * const room,
-    int win, const char * const text);
+void notify_typing(const char *const handle);
+void notify_message(ProfWin *window, const char *const name, const char *const text);
+void notify_room_message(const char *const handle, const char *const room,
+    int win, const char *const text);
 void notify_remind(void);
-void notify_invite(const char * const from, const char * const room,
-    const char * const reason);
-void notify_subscription(const char * const from);
+void notify_invite(const char *const from, const char *const room,
+    const char *const reason);
+void notify_subscription(const char *const from);
 
 #endif
diff --git a/src/ui/window.c b/src/ui/window.c
index 82073b40..2b3a9c54 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -60,8 +60,8 @@
 #define CEILING(X) (X-(int)(X) > 0 ? (int)(X+1) : (int)(X))
 
 static void _win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *time,
-    int flags, theme_item_t theme_item, const char * const from, const char * const message, DeliveryReceipt *receipt);
-static void _win_print_wrapped(WINDOW *win, const char * const message, size_t indent, int pad_indent);
+    int flags, theme_item_t theme_item, const char *const from, const char *const message, DeliveryReceipt *receipt);
+static void _win_print_wrapped(WINDOW *win, const char *const message, size_t indent, int pad_indent);
 
 int
 win_roster_cols(void)
@@ -127,7 +127,7 @@ win_create_console(void)
 }
 
 ProfWin*
-win_create_chat(const char * const barejid)
+win_create_chat(const char *const barejid)
 {
     ProfChatWin *new_win = malloc(sizeof(ProfChatWin));
     new_win->window.type = WIN_CHAT;
@@ -149,7 +149,7 @@ win_create_chat(const char * const barejid)
 }
 
 ProfWin*
-win_create_muc(const char * const roomjid)
+win_create_muc(const char *const roomjid)
 {
     ProfMucWin *new_win = malloc(sizeof(ProfMucWin));
     int cols = getmaxx(stdscr);
@@ -192,7 +192,7 @@ win_create_muc(const char * const roomjid)
 }
 
 ProfWin*
-win_create_muc_config(const char * const roomjid, DataForm *form)
+win_create_muc_config(const char *const roomjid, DataForm *form)
 {
     ProfMucConfWin *new_win = malloc(sizeof(ProfMucConfWin));
     new_win->window.type = WIN_MUC_CONFIG;
@@ -207,7 +207,7 @@ win_create_muc_config(const char * const roomjid, DataForm *form)
 }
 
 ProfWin*
-win_create_private(const char * const fulljid)
+win_create_private(const char *const fulljid)
 {
     ProfPrivateWin *new_win = malloc(sizeof(ProfPrivateWin));
     new_win->window.type = WIN_PRIVATE;
@@ -233,7 +233,7 @@ win_create_xmlconsole(void)
     return &new_win->window;
 }
 
-char *
+char*
 win_get_title(ProfWin *window)
 {
     if (window == NULL) {
@@ -634,7 +634,7 @@ win_show_contact(ProfWin *window, PContact contact)
 }
 
 void
-win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occupant)
+win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupant)
 {
     const char *presence_str = string_from_resource_presence(occupant->presence);
     const char *occupant_affiliation = muc_occupant_affiliation_str(occupant);
@@ -828,10 +828,10 @@ win_show_info(ProfWin *window, PContact contact)
 }
 
 void
-win_show_status_string(ProfWin *window, const char * const from,
-    const char * const show, const char * const status,
-    GDateTime *last_activity, const char * const pre,
-    const char * const default_show)
+win_show_status_string(ProfWin *window, const char *const from,
+    const char *const show, const char *const status,
+    GDateTime *last_activity, const char *const pre,
+    const char *const default_show)
 {
     theme_item_t presence_colour;
 
@@ -872,7 +872,7 @@ win_show_status_string(ProfWin *window, const char * const from,
 
 void
 win_print_incoming_message(ProfWin *window, GDateTime *timestamp,
-    const char * const from, const char * const message, prof_enc_t enc_mode)
+    const char *const from, const char *const message, prof_enc_t enc_mode)
 {
     char enc_char = '-';
 
@@ -897,7 +897,7 @@ win_print_incoming_message(ProfWin *window, GDateTime *timestamp,
 
 void
 win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp,
-    int flags, theme_item_t theme_item, const char * const from, const char * const message, ...)
+    int flags, theme_item_t theme_item, const char *const from, const char *const message, ...)
 {
     va_list arg;
     va_start(arg, message);
@@ -910,7 +910,7 @@ win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *tim
 
 void
 win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp,
-    int flags, theme_item_t theme_item, const char * const from, const char * const message)
+    int flags, theme_item_t theme_item, const char *const from, const char *const message)
 {
     if (timestamp == NULL) {
         timestamp = g_date_time_new_now_local();
@@ -927,7 +927,7 @@ win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *time
 
 void
 win_print_with_receipt(ProfWin *window, const char show_char, int pad_indent, GTimeVal *tstamp,
-    int flags, theme_item_t theme_item, const char * const from, const char * const message, char *id)
+    int flags, theme_item_t theme_item, const char *const from, const char *const message, char *id)
 {
     GDateTime *time;
 
@@ -949,7 +949,7 @@ win_print_with_receipt(ProfWin *window, const char show_char, int pad_indent, GT
 }
 
 void
-win_mark_received(ProfWin *window, const char * const id)
+win_mark_received(ProfWin *window, const char *const id)
 {
     gboolean received = buffer_mark_received(window->layout->buffer, id);
     if (received) {
@@ -958,7 +958,7 @@ win_mark_received(ProfWin *window, const char * const id)
 }
 
 void
-win_println(ProfWin *window, int pad, const char * const message)
+win_println(ProfWin *window, int pad, const char *const message)
 {
     win_print(window, '-', pad, NULL, 0, 0, "", message);
 }
@@ -971,7 +971,7 @@ win_newline(ProfWin *window)
 
 static void
 _win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *time,
-    int flags, theme_item_t theme_item, const char * const from, const char * const message, DeliveryReceipt *receipt)
+    int flags, theme_item_t theme_item, const char *const from, const char *const message, DeliveryReceipt *receipt)
 {
     // flags : 1st bit =  0/1 - me/not me
     //         2nd bit =  0/1 - date/no date
@@ -1098,7 +1098,7 @@ _win_indent(WINDOW *win, int size)
 }
 
 static void
-_win_print_wrapped(WINDOW *win, const char * const message, size_t indent, int pad_indent)
+_win_print_wrapped(WINDOW *win, const char *const message, size_t indent, int pad_indent)
 {
     int starty = getcury(win);
     int wordi = 0;
diff --git a/src/ui/window.h b/src/ui/window.h
index 603f1cc3..07191fc0 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -55,20 +55,20 @@
 #define PAD_SIZE 1000
 
 void win_move_to_end(ProfWin *window);
-void win_show_status_string(ProfWin *window, const char * const from,
-    const char * const show, const char * const status,
-    GDateTime *last_activity, const char * const pre,
-    const char * const default_show);
+void win_show_status_string(ProfWin *window, const char *const from,
+    const char *const show, const char *const status,
+    GDateTime *last_activity, const char *const pre,
+    const char *const default_show);
 void win_print_incoming_message(ProfWin *window, GDateTime *timestamp,
-    const char * const from, const char * const message, prof_enc_t enc_mode);
+    const char *const from, const char *const message, prof_enc_t enc_mode);
 void win_print_with_receipt(ProfWin *window, const char show_char, int pad_indent, GTimeVal *tstamp, int flags,
-    theme_item_t theme_item, const char * const from, const char * const message, char *id);
+    theme_item_t theme_item, const char *const from, const char *const message, char *id);
 void win_newline(ProfWin *window);
 void win_redraw(ProfWin *window);
 int win_roster_cols(void);
 int win_occpuants_cols(void);
 void win_printline_nowrap(WINDOW *win, char *msg);
-void win_mark_received(ProfWin *window, const char * const id);
+void win_mark_received(ProfWin *window, const char *const id);
 
 gboolean win_has_active_subwin(ProfWin *window);