devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Applied coding style to src/

Browse Source
This commit is contained in:
James Booth
2015-10-26 00:52:33 +00:00
parent c8a6bdb381
commit dd11334b06
18 changed files with 271 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/chat_session.c
View File

@@ -46,8 +46,8 @@
static GHashTable *sessions; static GHashTable *sessions;
static void static void
_chat_session_new(const char * const barejid, const char * const resource, _chat_session_new(const char *const barejid, const char *const resource, gboolean resource_override,
gboolean resource_override, gboolean send_states) gboolean send_states)
{ {
assert(barejid != NULL); assert(barejid != NULL);
assert(resource != NULL); assert(resource != NULL);
@@ -86,19 +86,19 @@ chat_sessions_clear(void)
} }
void void
chat_session_resource_override(const char * const barejid, const char * const resource) chat_session_resource_override(const char *const barejid, const char *const resource)
{ {
_chat_session_new(barejid, resource, TRUE, TRUE); _chat_session_new(barejid, resource, TRUE, TRUE);
} }
ChatSession* ChatSession*
chat_session_get(const char * const barejid) chat_session_get(const char *const barejid)
{ {
return g_hash_table_lookup(sessions, barejid); return g_hash_table_lookup(sessions, barejid);
} }
void void
chat_session_recipient_gone(const char * const barejid, const char * const resource) chat_session_recipient_gone(const char *const barejid, const char *const resource)
{ {
assert(barejid != NULL); assert(barejid != NULL);
assert(resource != NULL); assert(resource != NULL);
@@ -112,25 +112,25 @@ chat_session_recipient_gone(const char * const barejid, const char * const resou
} }
void void
chat_session_recipient_typing(const char * const barejid, const char * const resource) chat_session_recipient_typing(const char *const barejid, const char *const resource)
{ {
chat_session_recipient_active(barejid, resource, TRUE); chat_session_recipient_active(barejid, resource, TRUE);
} }
void void
chat_session_recipient_paused(const char * const barejid, const char * const resource) chat_session_recipient_paused(const char *const barejid, const char *const resource)
{ {
chat_session_recipient_active(barejid, resource, TRUE); chat_session_recipient_active(barejid, resource, TRUE);
} }
void void
chat_session_recipient_inactive(const char * const barejid, const char * const resource) chat_session_recipient_inactive(const char *const barejid, const char *const resource)
{ {
chat_session_recipient_active(barejid, resource, TRUE); chat_session_recipient_active(barejid, resource, TRUE);
} }
void void
chat_session_recipient_active(const char * const barejid, const char * const resource, chat_session_recipient_active(const char *const barejid, const char *const resource,
gboolean send_states) gboolean send_states)
{ {
assert(barejid != NULL); assert(barejid != NULL);
@@ -153,7 +153,7 @@ chat_session_recipient_active(const char * const barejid, const char * const res
} }
void void
chat_session_remove(const char * const barejid) chat_session_remove(const char *const barejid)
{ {
g_hash_table_remove(sessions, barejid); g_hash_table_remove(sessions, barejid);
} }

3
src/chat_session.h
View File

@@ -51,8 +51,7 @@ void chat_sessions_clear(void);
void chat_session_resource_override(const char *const barejid, const char *const resource); void chat_session_resource_override(const char *const barejid, const char *const resource);
ChatSession* chat_session_get(const char *const barejid); ChatSession* chat_session_get(const char *const barejid);
void chat_session_recipient_active(const char *const barejid, const char *const resource, void chat_session_recipient_active(const char *const barejid, const char *const resource, gboolean send_states);
gboolean send_states);
void chat_session_recipient_typing(const char *const barejid, const char *const resource); void chat_session_recipient_typing(const char *const barejid, const char *const resource);
void chat_session_recipient_paused(const char *const barejid, const char *const resource); void chat_session_recipient_paused(const char *const barejid, const char *const resource);
void chat_session_recipient_gone(const char *const barejid, const char *const resource); void chat_session_recipient_gone(const char *const barejid, const char *const resource);

12
src/chat_state.c
View File

@@ -44,7 +44,7 @@
#define PAUSED_TIMEOUT 10.0 #define PAUSED_TIMEOUT 10.0
#define INACTIVE_TIMEOUT 30.0 #define INACTIVE_TIMEOUT 30.0
static void _send_if_supported(const char * const barejid, void(*send_func)(const char * const)); static void _send_if_supported(const char *const barejid, void (*send_func)(const char *const));
ChatState* ChatState*
chat_state_new(void) chat_state_new(void)
@@ -66,7 +66,7 @@ chat_state_free(ChatState *state)
} }
void void
chat_state_handle_idle(const char * const barejid, ChatState *state) chat_state_handle_idle(const char *const barejid, ChatState *state)
{ {
gdouble elapsed = g_timer_elapsed(state->timer, NULL); gdouble elapsed = g_timer_elapsed(state->timer, NULL);
@@ -118,7 +118,7 @@ chat_state_handle_idle(const char * const barejid, ChatState *state)
} }
void void
chat_state_handle_typing(const char * const barejid, ChatState *state) chat_state_handle_typing(const char *const barejid, ChatState *state)
{ {
// ACTIVE|INACTIVE|PAUSED|GONE -> COMPOSING // ACTIVE|INACTIVE|PAUSED|GONE -> COMPOSING
if (state->type != CHAT_STATE_COMPOSING) { if (state->type != CHAT_STATE_COMPOSING) {
@@ -138,7 +138,7 @@ chat_state_active(ChatState *state)
} }
void void
chat_state_gone(const char * const barejid, ChatState *state) chat_state_gone(const char *const barejid, ChatState *state)
{ {
if (state->type != CHAT_STATE_GONE) { if (state->type != CHAT_STATE_GONE) {
if (prefs_get_boolean(PREF_STATES)) { if (prefs_get_boolean(PREF_STATES)) {
@@ -150,7 +150,7 @@ chat_state_gone(const char * const barejid, ChatState *state)
} }
static void static void
_send_if_supported(const char * const barejid, void(*send_func)(const char * const)) _send_if_supported(const char *const barejid, void (*send_func)(const char *const))
{ {
gboolean send = TRUE; gboolean send = TRUE;
GString *jid = g_string_new(barejid); GString *jid = g_string_new(barejid);
@@ -169,4 +169,4 @@ _send_if_supported(const char * const barejid, void(*send_func)(const char * con
} }
g_string_free(jid, TRUE); g_string_free(jid, TRUE);
} }

34
src/common.c
View File

@@ -62,7 +62,7 @@ static unsigned long unique_id = 0;
static size_t _data_callback(void *ptr, size_t size, size_t nmemb, void *data); static size_t _data_callback(void *ptr, size_t size, size_t nmemb, void *data);
// taken from glib 2.30.3 // taken from glib 2.30.3
gchar * gchar*
p_utf8_substring(const gchar *str, glong start_pos, glong end_pos) p_utf8_substring(const gchar *str, glong start_pos, glong end_pos)
{ {
gchar *start, *end, *out; gchar *start, *end, *out;
@@ -102,7 +102,7 @@ p_hash_table_add(GHashTable *hash_table, gpointer key)
} }
gboolean gboolean
p_hash_table_contains(GHashTable *hash_table, gconstpointer key) p_hash_table_contains(GHashTable *hash_table, gconstpointer key)
{ {
// doesn't handle when key exists, but value == NULL // doesn't handle when key exists, but value == NULL
gpointer found = g_hash_table_lookup(hash_table, key); gpointer found = g_hash_table_lookup(hash_table, key);
@@ -148,7 +148,7 @@ mkdir_recursive(const char *dir)
return result; return result;
} }
char * char*
str_replace(const char *string, const char *substr, str_replace(const char *string, const char *substr,
const char *replacement) const char *replacement)
{ {
@@ -193,7 +193,7 @@ str_replace(const char *string, const char *substr,
} }
gboolean gboolean
str_contains_str(const char * const searchstr, const char * const substr) str_contains_str(const char *const searchstr, const char *const substr)
{ {
if (!searchstr) { if (!searchstr) {
return FALSE; return FALSE;
@@ -244,7 +244,7 @@ strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg)
} }
int int
utf8_display_len(const char * const str) utf8_display_len(const char *const str)
{ {
if (!str) { if (!str) {
return 0; return 0;
@@ -265,7 +265,7 @@ utf8_display_len(const char * const str)
return len; return len;
} }
char * char*
prof_getline(FILE *stream) prof_getline(FILE *stream)
{ {
char *buf; char *buf;
@@ -309,8 +309,8 @@ prof_getline(FILE *stream)
return s; return s;
} }
char * char*
release_get_latest() release_get_latest(void)
{ {
char *url = "http://www.profanity.im/profanity_version.txt"; char *url = "http://www.profanity.im/profanity_version.txt";
@@ -362,7 +362,7 @@ release_is_new(char *found_version)
} }
gboolean gboolean
valid_resource_presence_string(const char * const str) valid_resource_presence_string(const char *const str)
{ {
assert(str != NULL); assert(str != NULL);
if ((strcmp(str, "online") == 0) || (strcmp(str, "chat") == 0) || if ((strcmp(str, "online") == 0) || (strcmp(str, "chat") == 0) ||
@@ -374,7 +374,7 @@ valid_resource_presence_string(const char * const str)
} }
} }
const char * const char*
string_from_resource_presence(resource_presence_t presence) string_from_resource_presence(resource_presence_t presence)
{ {
switch(presence) switch(presence)
@@ -393,7 +393,7 @@ string_from_resource_presence(resource_presence_t presence)
} }
resource_presence_t resource_presence_t
resource_presence_from_string(const char * const str) resource_presence_from_string(const char *const str)
{ {
if (str == NULL) { if (str == NULL) {
return RESOURCE_ONLINE; return RESOURCE_ONLINE;
@@ -430,7 +430,7 @@ contact_presence_from_resource_presence(resource_presence_t resource_presence)
} }
} }
gchar * gchar*
xdg_get_config_home(void) xdg_get_config_home(void)
{ {
gchar *xdg_config_home = getenv("XDG_CONFIG_HOME"); gchar *xdg_config_home = getenv("XDG_CONFIG_HOME");
@@ -449,7 +449,7 @@ xdg_get_config_home(void)
} }
} }
gchar * gchar*
xdg_get_data_home(void) xdg_get_data_home(void)
{ {
gchar *xdg_data_home = getenv("XDG_DATA_HOME"); gchar *xdg_data_home = getenv("XDG_DATA_HOME");
@@ -468,7 +468,7 @@ xdg_get_data_home(void)
} }
} }
char * char*
create_unique_id(char *prefix) create_unique_id(char *prefix)
{ {
char *result = NULL; char *result = NULL;
@@ -492,7 +492,7 @@ reset_unique_id(void)
unique_id = 0; unique_id = 0;
} }
char * char*
p_sha1_hash(char *str) p_sha1_hash(char *str)
{ {
P_SHA1_CTX ctx; P_SHA1_CTX ctx;
@@ -623,8 +623,8 @@ get_file_or_linked(char *loc, char *basedir)
return true_loc; return true_loc;
} }
char * char*
strip_arg_quotes(const char * const input) strip_arg_quotes(const char *const input)
{ {
char *unquoted = strdup(input); char *unquoted = strdup(input);

3
src/common.h
View File

@@ -102,8 +102,7 @@ gboolean p_hash_table_contains(GHashTable *hash_table, gconstpointer key);
gboolean create_dir(char *name); gboolean create_dir(char *name);
gboolean mkdir_recursive(const char *dir); gboolean mkdir_recursive(const char *dir);
char* str_replace(const char *string, const char *substr, char* str_replace(const char *string, const char *substr, const char *replacement);
const char *replacement);
gboolean str_contains_str(const char *const searchstr, const char *const substr); gboolean str_contains_str(const char *const searchstr, const char *const substr);
int str_contains(const char str[], int size, char ch); int str_contains(const char str[], int size, char ch);
gboolean strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg); gboolean strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg);

50
src/contact.c
View File

@@ -58,9 +58,9 @@ struct p_contact_t {
}; };
PContact PContact
p_contact_new(const char * const barejid, const char * const name, p_contact_new(const char *const barejid, const char *const name,
GSList *groups, const char * const subscription, GSList *groups, const char *const subscription,
const char * const offline_message, gboolean pending_out) const char *const offline_message, gboolean pending_out)
{ {
PContact contact = malloc(sizeof(struct p_contact_t)); PContact contact = malloc(sizeof(struct p_contact_t));
contact->barejid = strdup(barejid); contact->barejid = strdup(barejid);
@@ -98,7 +98,7 @@ p_contact_new(const char * const barejid, const char * const name,
} }
void void
p_contact_set_name(const PContact contact, const char * const name) p_contact_set_name(const PContact contact, const char *const name)
{ {
FREE_SET_NULL(contact->name); FREE_SET_NULL(contact->name);
FREE_SET_NULL(contact->name_collate_key); FREE_SET_NULL(contact->name_collate_key);
@@ -120,7 +120,7 @@ p_contact_set_groups(const PContact contact, GSList *groups)
} }
gboolean gboolean
p_contact_in_group(const PContact contact, const char * const group) p_contact_in_group(const PContact contact, const char *const group)
{ {
GSList *groups = contact->groups; GSList *groups = contact->groups;
while (groups) { while (groups) {
@@ -133,14 +133,14 @@ p_contact_in_group(const PContact contact, const char * const group)
return FALSE; return FALSE;
} }
GSList * GSList*
p_contact_groups(const PContact contact) p_contact_groups(const PContact contact)
{ {
return contact->groups; return contact->groups;
} }
gboolean gboolean
p_contact_remove_resource(PContact contact, const char * const resource) p_contact_remove_resource(PContact contact, const char *const resource)
{ {
gboolean result = g_hash_table_remove(contact->available_resources, resource); gboolean result = g_hash_table_remove(contact->available_resources, resource);
autocomplete_remove(contact->resource_ac, resource); autocomplete_remove(contact->resource_ac, resource);
@@ -173,31 +173,31 @@ p_contact_free(PContact contact)
} }
} }
const char * const char*
p_contact_barejid(const PContact contact) p_contact_barejid(const PContact contact)
{ {
return contact->barejid; return contact->barejid;
} }
const char * const char*
p_contact_barejid_collate_key(const PContact contact) p_contact_barejid_collate_key(const PContact contact)
{ {
return contact->barejid_collate_key; return contact->barejid_collate_key;
} }
const char * const char*
p_contact_name(const PContact contact) p_contact_name(const PContact contact)
{ {
return contact->name; return contact->name;
} }
const char * const char*
p_contact_name_collate_key(const PContact contact) p_contact_name_collate_key(const PContact contact)
{ {
return contact->name_collate_key; return contact->name_collate_key;
} }
const char * const char*
p_contact_name_or_jid(const PContact contact) p_contact_name_or_jid(const PContact contact)
{ {
if (contact->name) { if (contact->name) {
@@ -207,8 +207,8 @@ p_contact_name_or_jid(const PContact contact)
} }
} }
char * char*
p_contact_create_display_string(const PContact contact, const char * const resource) p_contact_create_display_string(const PContact contact, const char *const resource)
{ {
GString *result_str = g_string_new(""); GString *result_str = g_string_new("");
@@ -229,7 +229,7 @@ p_contact_create_display_string(const PContact contact, const char * const resou
return result; return result;
} }
static Resource * static Resource*
_highest_presence(Resource *first, Resource *second) _highest_presence(Resource *first, Resource *second)
{ {
if (first->presence == RESOURCE_CHAT) { if (first->presence == RESOURCE_CHAT) {
@@ -253,7 +253,7 @@ _highest_presence(Resource *first, Resource *second)
} }
} }
Resource * Resource*
_get_most_available_resource(PContact contact) _get_most_available_resource(PContact contact)
{ {
// find resource with highest priority, if more than one, // find resource with highest priority, if more than one,
@@ -287,7 +287,7 @@ _get_most_available_resource(PContact contact)
return highest; return highest;
} }
const char * const char*
p_contact_presence(const PContact contact) p_contact_presence(const PContact contact)
{ {
assert(contact != NULL); assert(contact != NULL);
@@ -302,7 +302,7 @@ p_contact_presence(const PContact contact)
return string_from_resource_presence(resource->presence); return string_from_resource_presence(resource->presence);
} }
const char * const char*
p_contact_status(const PContact contact) p_contact_status(const PContact contact)
{ {
assert(contact != NULL); assert(contact != NULL);
@@ -317,7 +317,7 @@ p_contact_status(const PContact contact)
return resource->status; return resource->status;
} }
const char * const char*
p_contact_subscription(const PContact contact) p_contact_subscription(const PContact contact)
{ {
return contact->subscription; return contact->subscription;
@@ -337,8 +337,8 @@ p_contact_subscribed(const PContact contact)
} }
} }
Resource * Resource*
p_contact_get_resource(const PContact contact, const char * const resource) p_contact_get_resource(const PContact contact, const char *const resource)
{ {
return g_hash_table_lookup(contact->available_resources, resource); return g_hash_table_lookup(contact->available_resources, resource);
} }
@@ -349,13 +349,13 @@ p_contact_pending_out(const PContact contact)
return contact->pending_out; return contact->pending_out;
} }
GDateTime * GDateTime*
p_contact_last_activity(const PContact contact) p_contact_last_activity(const PContact contact)
{ {
return contact->last_activity; return contact->last_activity;
} }
GList * GList*
p_contact_get_available_resources(const PContact contact) p_contact_get_available_resources(const PContact contact)
{ {
assert(contact != NULL); assert(contact != NULL);
@@ -406,7 +406,7 @@ p_contact_set_presence(const PContact contact, Resource *resource)
} }
void void
p_contact_set_subscription(const PContact contact, const char * const subscription) p_contact_set_subscription(const PContact contact, const char *const subscription)
{ {
FREE_SET_NULL(contact->subscription); FREE_SET_NULL(contact->subscription);
if (subscription) { if (subscription) {
@@ -443,4 +443,4 @@ void
p_contact_resource_ac_reset(const PContact contact) p_contact_resource_ac_reset(const PContact contact)
{ {
autocomplete_reset(contact->resource_ac); autocomplete_reset(contact->resource_ac);
} }

7
src/contact.h
View File

@@ -40,9 +40,8 @@
typedef struct p_contact_t *PContact; typedef struct p_contact_t *PContact;
PContact p_contact_new(const char *const barejid, const char *const name, PContact p_contact_new(const char *const barejid, const char *const name, GSList *groups,
GSList *groups, const char *const subscription, const char *const subscription, const char *const offline_message, gboolean pending_out);
const char *const offline_message, gboolean pending_out);
void p_contact_add_resource(PContact contact, Resource *resource); void p_contact_add_resource(PContact contact, Resource *resource);
gboolean p_contact_remove_resource(PContact contact, const char *const resource); gboolean p_contact_remove_resource(PContact contact, const char *const resource);
void p_contact_free(PContact contact); void p_contact_free(PContact contact);
@@ -67,7 +66,7 @@ gboolean p_contact_is_available(const PContact contact);
gboolean p_contact_has_available_resource(const PContact contact); gboolean p_contact_has_available_resource(const PContact contact);
Resource* p_contact_get_resource(const PContact contact, const char *const resource); Resource* p_contact_get_resource(const PContact contact, const char *const resource);
void p_contact_set_groups(const PContact contact, GSList *groups); void p_contact_set_groups(const PContact contact, GSList *groups);
GSList * p_contact_groups(const PContact contact); GSList* p_contact_groups(const PContact contact);
gboolean p_contact_in_group(const PContact contact, const char *const group); gboolean p_contact_in_group(const PContact contact, const char *const group);
gboolean p_contact_subscribed(const PContact contact); gboolean p_contact_subscribed(const PContact contact);
char* p_contact_create_display_string(const PContact contact, const char *const resource); char* p_contact_create_display_string(const PContact contact, const char *const resource);

18
src/jid.c
View File

@@ -41,8 +41,8 @@
#include "common.h" #include "common.h"
Jid * Jid*
jid_create(const gchar * const str) jid_create(const gchar *const str)
{ {
Jid *result = NULL; Jid *result = NULL;
@@ -106,8 +106,8 @@ jid_create(const gchar * const str)
return result; return result;
} }
Jid * Jid*
jid_create_from_bare_and_resource(const char * const room, const char * const nick) jid_create_from_bare_and_resource(const char *const room, const char *const nick)
{ {
Jid *result; Jid *result;
char *jid = create_fulljid(room, nick); char *jid = create_fulljid(room, nick);
@@ -142,8 +142,8 @@ jid_is_valid_room_form(Jid *jid)
* barejid/resourcepart * barejid/resourcepart
* Will return a newly created string that must be freed by the caller * Will return a newly created string that must be freed by the caller
*/ */
char * char*
create_fulljid(const char * const barejid, const char * const resource) create_fulljid(const char *const barejid, const char *const resource)
{ {
gchar *barejidlower = g_utf8_strdown(barejid, -1); gchar *barejidlower = g_utf8_strdown(barejid, -1);
GString *full_jid = g_string_new(barejidlower); GString *full_jid = g_string_new(barejidlower);
@@ -163,8 +163,8 @@ create_fulljid(const char * const barejid, const char * const resource)
* Full JID = "test@conference.server/person" * Full JID = "test@conference.server/person"
* returns "person" * returns "person"
*/ */
char * char*
get_nick_from_full_jid(const char * const full_room_jid) get_nick_from_full_jid(const char *const full_room_jid)
{ {
char **tokens = g_strsplit(full_room_jid, "/", 0); char **tokens = g_strsplit(full_room_jid, "/", 0);
char *nick_part = NULL; char *nick_part = NULL;
@@ -184,7 +184,7 @@ get_nick_from_full_jid(const char * const full_room_jid)
/* /*
* get the fulljid, fall back to the barejid * get the fulljid, fall back to the barejid
*/ */
char * char*
jid_fulljid_or_barejid(Jid *jid) jid_fulljid_or_barejid(Jid *jid)
{ {
if (jid->fulljid) { if (jid->fulljid) {

76
src/log.c
View File

@@ -78,23 +78,22 @@ struct dated_chat_log {
}; };
static gboolean _log_roll_needed(struct dated_chat_log *dated_log); static gboolean _log_roll_needed(struct dated_chat_log *dated_log);
static struct dated_chat_log * _create_log(const char * const other, const char * const login); static struct dated_chat_log* _create_log(const char *const other, const char *const login);
static struct dated_chat_log * _create_groupchat_log(char *room, const char * const login); static struct dated_chat_log* _create_groupchat_log(char *room, const char *const login);
static void _free_chat_log(struct dated_chat_log *dated_log); static void _free_chat_log(struct dated_chat_log *dated_log);
static gboolean _key_equals(void *key1, void *key2); static gboolean _key_equals(void *key1, void *key2);
static char * _get_log_filename(const char * const other, const char * const login, static char* _get_log_filename(const char *const other, const char *const login, GDateTime *dt, gboolean create);
GDateTime *dt, gboolean create); static char* _get_groupchat_log_filename(const char *const room, const char *const login, GDateTime *dt,
static char * _get_groupchat_log_filename(const char * const room, gboolean create);
const char * const login, GDateTime *dt, gboolean create); static gchar* _get_chatlog_dir(void);
static gchar * _get_chatlog_dir(void); static gchar* _get_main_log_file(void);
static gchar * _get_main_log_file(void);
static void _rotate_log_file(void); static void _rotate_log_file(void);
static char* _log_string_from_level(log_level_t level); static char* _log_string_from_level(log_level_t level);
static void _chat_log_chat(const char * const login, const char * const other, static void _chat_log_chat(const char *const login, const char *const other, const gchar *const msg,
const gchar * const msg, chat_log_direction_t direction, GDateTime *timestamp); chat_log_direction_t direction, GDateTime *timestamp);
void void
log_debug(const char * const msg, ...) log_debug(const char *const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
@@ -106,7 +105,7 @@ log_debug(const char * const msg, ...)
} }
void void
log_info(const char * const msg, ...) log_info(const char *const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
@@ -118,7 +117,7 @@ log_info(const char * const msg, ...)
} }
void void
log_warning(const char * const msg, ...) log_warning(const char *const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
@@ -130,7 +129,7 @@ log_warning(const char * const msg, ...)
} }
void void
log_error(const char * const msg, ...) log_error(const char *const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
@@ -160,7 +159,7 @@ log_reinit(void)
log_init(level_filter); log_init(level_filter);
} }
char * char*
get_log_file_location(void) get_log_file_location(void)
{ {
return mainlogfile->str; return mainlogfile->str;
@@ -183,7 +182,7 @@ log_close(void)
} }
void void
log_msg(log_level_t level, const char * const area, const char * const msg) log_msg(log_level_t level, const char *const area, const char *const msg)
{ {
if (level >= level_filter && logp) { if (level >= level_filter && logp) {
dt = g_date_time_new_now(tz); dt = g_date_time_new_now(tz);
@@ -263,7 +262,7 @@ groupchat_log_init(void)
} }
void void
chat_log_msg_out(const char * const barejid, const char * const msg) chat_log_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -274,7 +273,7 @@ chat_log_msg_out(const char * const barejid, const char * const msg)
} }
void void
chat_log_otr_msg_out(const char * const barejid, const char * const msg) chat_log_otr_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -291,7 +290,7 @@ chat_log_otr_msg_out(const char * const barejid, const char * const msg)
} }
void void
chat_log_pgp_msg_out(const char * const barejid, const char * const msg) chat_log_pgp_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -308,7 +307,7 @@ chat_log_pgp_msg_out(const char * const barejid, const char * const msg)
} }
void void
chat_log_otr_msg_in(const char * const barejid, const char * const msg, gboolean was_decrypted, GDateTime *timestamp) chat_log_otr_msg_in(const char *const barejid, const char *const msg, gboolean was_decrypted, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -325,7 +324,7 @@ chat_log_otr_msg_in(const char * const barejid, const char * const msg, gboolean
} }
void void
chat_log_pgp_msg_in(const char * const barejid, const char * const msg, GDateTime *timestamp) chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -342,7 +341,7 @@ chat_log_pgp_msg_in(const char * const barejid, const char * const msg, GDateTim
} }
void void
chat_log_msg_in(const char * const barejid, const char * const msg, GDateTime *timestamp) chat_log_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@@ -353,8 +352,8 @@ chat_log_msg_in(const char * const barejid, const char * const msg, GDateTime *t
} }
static void static void
_chat_log_chat(const char * const login, const char * const other, _chat_log_chat(const char *const login, const char *const other, const char *const msg,
const char * const msg, chat_log_direction_t direction, GDateTime *timestamp) chat_log_direction_t direction, GDateTime *timestamp)
{ {
struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other); struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other);
@@ -404,8 +403,7 @@ _chat_log_chat(const char * const login, const char * const other,
} }
void void
groupchat_log_chat(const gchar * const login, const gchar * const room, groupchat_log_chat(const gchar *const login, const gchar *const room, const gchar *const nick, const gchar *const msg)
const gchar * const nick, const gchar * const msg)
{ {
gchar *room_copy = strdup(room); gchar *room_copy = strdup(room);
struct dated_chat_log *dated_log = g_hash_table_lookup(groupchat_logs, room_copy); struct dated_chat_log *dated_log = g_hash_table_lookup(groupchat_logs, room_copy);
@@ -446,8 +444,8 @@ groupchat_log_chat(const gchar * const login, const gchar * const room,
} }
GSList * GSList*
chat_log_get_previous(const gchar * const login, const gchar * const recipient) chat_log_get_previous(const gchar *const login, const gchar *const recipient)
{ {
GSList *history = NULL; GSList *history = NULL;
GDateTime *now = g_date_time_new_now_local(); GDateTime *now = g_date_time_new_now_local();
@@ -502,8 +500,8 @@ chat_log_close(void)
g_date_time_unref(session_started); g_date_time_unref(session_started);
} }
static struct dated_chat_log * static struct dated_chat_log*
_create_log(const char * const other, const char * const login) _create_log(const char *const other, const char *const login)
{ {
GDateTime *now = g_date_time_new_now_local(); GDateTime *now = g_date_time_new_now_local();
char *filename = _get_log_filename(other, login, now, TRUE); char *filename = _get_log_filename(other, login, now, TRUE);
@@ -517,8 +515,8 @@ _create_log(const char * const other, const char * const login)
return new_log; return new_log;
} }
static struct dated_chat_log * static struct dated_chat_log*
_create_groupchat_log(char *room, const char * const login) _create_groupchat_log(char *room, const char *const login)
{ {
GDateTime *now = g_date_time_new_now_local(); GDateTime *now = g_date_time_new_now_local();
char *filename = _get_groupchat_log_filename(room, login, now, TRUE); char *filename = _get_groupchat_log_filename(room, login, now, TRUE);
@@ -571,9 +569,8 @@ gboolean _key_equals(void *key1, void *key2)
return (g_strcmp0(str1, str2) == 0); return (g_strcmp0(str1, str2) == 0);
} }
static char * static char*
_get_log_filename(const char * const other, const char * const login, _get_log_filename(const char *const other, const char *const login, GDateTime *dt, gboolean create)
GDateTime *dt, gboolean create)
{ {
gchar *chatlogs_dir = _get_chatlog_dir(); gchar *chatlogs_dir = _get_chatlog_dir();
GString *log_file = g_string_new(chatlogs_dir); GString *log_file = g_string_new(chatlogs_dir);
@@ -603,9 +600,8 @@ _get_log_filename(const char * const other, const char * const login,
return result; return result;
} }
static char * static char*
_get_groupchat_log_filename(const char * const room, const char * const login, _get_groupchat_log_filename(const char *const room, const char *const login, GDateTime *dt, gboolean create)
GDateTime *dt, gboolean create)
{ {
gchar *chatlogs_dir = _get_chatlog_dir(); gchar *chatlogs_dir = _get_chatlog_dir();
GString *log_file = g_string_new(chatlogs_dir); GString *log_file = g_string_new(chatlogs_dir);
@@ -640,7 +636,7 @@ _get_groupchat_log_filename(const char * const room, const char * const login,
return result; return result;
} }
static gchar * static gchar*
_get_chatlog_dir(void) _get_chatlog_dir(void)
{ {
gchar *xdg_data = xdg_get_data_home(); gchar *xdg_data = xdg_get_data_home();
@@ -653,7 +649,7 @@ _get_chatlog_dir(void)
return result; return result;
} }
static gchar * static gchar*
_get_main_log_file(void) _get_main_log_file(void)
{ {
gchar *xdg_data = xdg_get_data_home(); gchar *xdg_data = xdg_get_data_home();

11
src/log.h
View File

@@ -59,8 +59,7 @@ void log_debug(const char *const msg, ...);
void log_info(const char *const msg, ...); void log_info(const char *const msg, ...);
void log_warning(const char *const msg, ...); void log_warning(const char *const msg, ...);
void log_error(const char *const msg, ...); void log_error(const char *const msg, ...);
void log_msg(log_level_t level, const char *const area, void log_msg(log_level_t level, const char *const area, const char *const msg);
const char *const msg);
log_level_t log_level_from_string(char *log_level); log_level_t log_level_from_string(char *log_level);
void log_stderr_init(log_level_t level); void log_stderr_init(log_level_t level);
@@ -78,10 +77,10 @@ void chat_log_otr_msg_in(const char *const barejid, const char *const msg, gbool
void chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp); void chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp);
void chat_log_close(void); void chat_log_close(void);
GSList* chat_log_get_previous(const gchar *const login, GSList* chat_log_get_previous(const gchar *const login, const gchar *const recipient);
const gchar *const recipient);
void groupchat_log_init(void); void groupchat_log_init(void);
void groupchat_log_chat(const gchar *const login, const gchar *const room, void groupchat_log_chat(const gchar *const login, const gchar *const room, const gchar *const nick,
const gchar *const nick, const gchar *const msg); const gchar *const msg);
#endif #endif

155
src/muc.c
View File

@@ -72,12 +72,12 @@ Autocomplete invite_ac;
static void _free_room(ChatRoom *room); static void _free_room(ChatRoom *room);
static gint _compare_occupants(Occupant *a, Occupant *b); static gint _compare_occupants(Occupant *a, Occupant *b);
static muc_role_t _role_from_string(const char * const role); static muc_role_t _role_from_string(const char *const role);
static muc_affiliation_t _affiliation_from_string(const char * const affiliation); static muc_affiliation_t _affiliation_from_string(const char *const affiliation);
static char* _role_to_string(muc_role_t role); static char* _role_to_string(muc_role_t role);
static char* _affiliation_to_string(muc_affiliation_t affiliation); static char* _affiliation_to_string(muc_affiliation_t affiliation);
static Occupant* _muc_occupant_new(const char *const nick, const char * const jid, static Occupant* _muc_occupant_new(const char *const nick, const char *const jid, muc_role_t role,
muc_role_t role, muc_affiliation_t affiliation, resource_presence_t presence, const char * const status); muc_affiliation_t affiliation, resource_presence_t presence, const char *const status);
static void _occupant_free(Occupant *occupant); static void _occupant_free(Occupant *occupant);
void void
@@ -99,7 +99,7 @@ muc_close(void)
} }
void void
muc_invites_add(const char * const room, const char * const password) muc_invites_add(const char *const room, const char *const password)
{ {
autocomplete_add(invite_ac, room); autocomplete_add(invite_ac, room);
if (password) { if (password) {
@@ -108,7 +108,7 @@ muc_invites_add(const char * const room, const char * const password)
} }
void void
muc_invites_remove(const char * const room) muc_invites_remove(const char *const room)
{ {
autocomplete_remove(invite_ac, room); autocomplete_remove(invite_ac, room);
g_hash_table_remove(invite_passwords, room); g_hash_table_remove(invite_passwords, room);
@@ -120,20 +120,20 @@ muc_invites_count(void)
return autocomplete_length(invite_ac); return autocomplete_length(invite_ac);
} }
GSList * GSList*
muc_invites(void) muc_invites(void)
{ {
return autocomplete_create_list(invite_ac); return autocomplete_create_list(invite_ac);
} }
char * char*
muc_invite_password(const char * const room) muc_invite_password(const char *const room)
{ {
return g_hash_table_lookup(invite_passwords, room); return g_hash_table_lookup(invite_passwords, room);
} }
gboolean gboolean
muc_invites_contain(const char * const room) muc_invites_contain(const char *const room)
{ {
GSList *invites = autocomplete_create_list(invite_ac); GSList *invites = autocomplete_create_list(invite_ac);
GSList *curr = invites; GSList *curr = invites;
@@ -156,8 +156,8 @@ muc_invites_reset_ac(void)
autocomplete_reset(invite_ac); autocomplete_reset(invite_ac);
} }
char * char*
muc_invites_find(const char * const search_str) muc_invites_find(const char *const search_str)
{ {
return autocomplete_complete(invite_ac, search_str, TRUE); return autocomplete_complete(invite_ac, search_str, TRUE);
} }
@@ -172,8 +172,7 @@ muc_invites_clear(void)
} }
void void
muc_join(const char * const room, const char * const nick, muc_join(const char *const room, const char *const nick, const char *const password, gboolean autojoin)
const char * const password, gboolean autojoin)
{ {
ChatRoom *new_room = malloc(sizeof(ChatRoom)); ChatRoom *new_room = malloc(sizeof(ChatRoom));
new_room->room = strdup(room); new_room->room = strdup(room);
@@ -202,13 +201,13 @@ muc_join(const char * const room, const char * const nick,
} }
void void
muc_leave(const char * const room) muc_leave(const char *const room)
{ {
g_hash_table_remove(rooms, room); g_hash_table_remove(rooms, room);
} }
gboolean gboolean
muc_requires_config(const char * const room) muc_requires_config(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -220,7 +219,7 @@ muc_requires_config(const char * const room)
} }
void void
muc_set_requires_config(const char * const room, gboolean val) muc_set_requires_config(const char *const room, gboolean val)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -229,7 +228,7 @@ muc_set_requires_config(const char * const room, gboolean val)
} }
void void
muc_set_features(const char * const room, GSList *features) muc_set_features(const char *const room, GSList *features)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room && features) { if (chat_room && features) {
@@ -245,14 +244,14 @@ muc_set_features(const char * const room, GSList *features)
* Returns TRUE if the user is currently in the room * Returns TRUE if the user is currently in the room
*/ */
gboolean gboolean
muc_active(const char * const room) muc_active(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
return (chat_room != NULL); return (chat_room != NULL);
} }
gboolean gboolean
muc_autojoin(const char * const room) muc_autojoin(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -263,7 +262,7 @@ muc_autojoin(const char * const room)
} }
void void
muc_set_subject(const char * const room, const char * const subject) muc_set_subject(const char *const room, const char *const subject)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -276,8 +275,8 @@ muc_set_subject(const char * const room, const char * const subject)
} }
} }
char * char*
muc_subject(const char * const room) muc_subject(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -288,7 +287,7 @@ muc_subject(const char * const room)
} }
void void
muc_pending_broadcasts_add(const char * const room, const char * const message) muc_pending_broadcasts_add(const char *const room, const char *const message)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -296,8 +295,8 @@ muc_pending_broadcasts_add(const char * const room, const char * const message)
} }
} }
GList * GList*
muc_pending_broadcasts(const char * const room) muc_pending_broadcasts(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -307,8 +306,8 @@ muc_pending_broadcasts(const char * const room)
} }
} }
char * char*
muc_old_nick(const char * const room, const char * const new_nick) muc_old_nick(const char *const room, const char *const new_nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room && chat_room->pending_nick_change) { if (chat_room && chat_room->pending_nick_change) {
@@ -323,7 +322,7 @@ muc_old_nick(const char * const room, const char * const new_nick)
* and is awaiting the response * and is awaiting the response
*/ */
void void
muc_nick_change_start(const char * const room, const char * const new_nick) muc_nick_change_start(const char *const room, const char *const new_nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -337,7 +336,7 @@ muc_nick_change_start(const char * const room, const char * const new_nick)
* nick change * nick change
*/ */
gboolean gboolean
muc_nick_change_pending(const char * const room) muc_nick_change_pending(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -352,7 +351,7 @@ muc_nick_change_pending(const char * const room)
* the service has responded * the service has responded
*/ */
void void
muc_nick_change_complete(const char * const room, const char * const nick) muc_nick_change_complete(const char *const room, const char *const nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -370,7 +369,7 @@ muc_nick_change_complete(const char * const room, const char * const nick)
* The contents of the list are owned by the chat room and should not be * The contents of the list are owned by the chat room and should not be
* modified or freed. * modified or freed.
*/ */
GList * GList*
muc_rooms(void) muc_rooms(void)
{ {
return g_hash_table_get_keys(rooms); return g_hash_table_get_keys(rooms);
@@ -380,8 +379,8 @@ muc_rooms(void)
* Return current users nickname for the specified room * Return current users nickname for the specified room
* The nickname is owned by the chat room and should not be modified or freed * The nickname is owned by the chat room and should not be modified or freed
*/ */
char * char*
muc_nick(const char * const room) muc_nick(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -395,8 +394,8 @@ muc_nick(const char * const room)
* Return password for the specified room * Return password for the specified room
* The password is owned by the chat room and should not be modified or freed * The password is owned by the chat room and should not be modified or freed
*/ */
char * char*
muc_password(const char * const room) muc_password(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -410,7 +409,7 @@ muc_password(const char * const room)
* Returns TRUE if the specified nick exists in the room's roster * Returns TRUE if the specified nick exists in the room's roster
*/ */
gboolean gboolean
muc_roster_contains_nick(const char * const room, const char * const nick) muc_roster_contains_nick(const char *const room, const char *const nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -425,8 +424,8 @@ muc_roster_contains_nick(const char * const room, const char * const nick)
* Add a new chat room member to the room's roster * Add a new chat room member to the room's roster
*/ */
gboolean gboolean
muc_roster_add(const char * const room, const char * const nick, const char * const jid, muc_roster_add(const char *const room, const char *const nick, const char *const jid, const char *const role,
const char * const role, const char * const affiliation, const char * const show, const char * const status) const char *const affiliation, const char *const show, const char *const status)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
gboolean updated = FALSE; gboolean updated = FALSE;
@@ -465,7 +464,7 @@ muc_roster_add(const char * const room, const char * const nick, const char * co
* Remove a room member from the room's roster * Remove a room member from the room's roster
*/ */
void void
muc_roster_remove(const char * const room, const char * const nick) muc_roster_remove(const char *const room, const char *const nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -474,8 +473,8 @@ muc_roster_remove(const char * const room, const char * const nick)
} }
} }
Occupant * Occupant*
muc_roster_item(const char * const room, const char * const nick) muc_roster_item(const char *const room, const char *const nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -489,8 +488,8 @@ muc_roster_item(const char * const room, const char * const nick)
/* /*
* Return a list of PContacts representing the room members in the room's roster * Return a list of PContacts representing the room members in the room's roster
*/ */
GList * GList*
muc_roster(const char * const room) muc_roster(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -515,7 +514,7 @@ muc_roster(const char * const room)
* Return a Autocomplete representing the room member's in the roster * Return a Autocomplete representing the room member's in the roster
*/ */
Autocomplete Autocomplete
muc_roster_ac(const char * const room) muc_roster_ac(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -526,7 +525,7 @@ muc_roster_ac(const char * const room)
} }
Autocomplete Autocomplete
muc_roster_jid_ac(const char * const room) muc_roster_jid_ac(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -540,7 +539,7 @@ muc_roster_jid_ac(const char * const room)
* Set to TRUE when the rooms roster has been fully received * Set to TRUE when the rooms roster has been fully received
*/ */
void void
muc_roster_set_complete(const char * const room) muc_roster_set_complete(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -552,7 +551,7 @@ muc_roster_set_complete(const char * const room)
* Returns TRUE id the rooms roster has been fully received * Returns TRUE id the rooms roster has been fully received
*/ */
gboolean gboolean
muc_roster_complete(const char * const room) muc_roster_complete(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -568,20 +567,20 @@ muc_occupant_available(Occupant *occupant)
return (occupant->presence == RESOURCE_ONLINE || occupant->presence == RESOURCE_CHAT); return (occupant->presence == RESOURCE_ONLINE || occupant->presence == RESOURCE_CHAT);
} }
const char * const char*
muc_occupant_affiliation_str(Occupant *occupant) muc_occupant_affiliation_str(Occupant *occupant)
{ {
return _affiliation_to_string(occupant->affiliation); return _affiliation_to_string(occupant->affiliation);
} }
const char * const char*
muc_occupant_role_str(Occupant *occupant) muc_occupant_role_str(Occupant *occupant)
{ {
return _role_to_string(occupant->role); return _role_to_string(occupant->role);
} }
GSList * GSList*
muc_occupants_by_role(const char * const room, muc_role_t role) muc_occupants_by_role(const char *const room, muc_role_t role)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -603,8 +602,8 @@ muc_occupants_by_role(const char * const room, muc_role_t role)
} }
} }
GSList * GSList*
muc_occupants_by_affiliation(const char * const room, muc_affiliation_t affiliation) muc_occupants_by_affiliation(const char *const room, muc_affiliation_t affiliation)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -631,8 +630,7 @@ muc_occupants_by_affiliation(const char * const room, muc_affiliation_t affiliat
* is in progress * is in progress
*/ */
void void
muc_occupant_nick_change_start(const char * const room, muc_occupant_nick_change_start(const char *const room, const char *const new_nick, const char *const old_nick)
const char * const new_nick, const char * const old_nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -647,9 +645,8 @@ muc_occupant_nick_change_start(const char * const room,
* The old nick name will be returned in a new string which must be freed by * The old nick name will be returned in a new string which must be freed by
* the caller * the caller
*/ */
char * char*
muc_roster_nick_change_complete(const char * const room, muc_roster_nick_change_complete(const char *const room, const char *const nick)
const char * const nick)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -665,8 +662,8 @@ muc_roster_nick_change_complete(const char * const room,
return NULL; return NULL;
} }
char * char*
muc_autocomplete(ProfWin *window, const char * const input) muc_autocomplete(ProfWin *window, const char *const input)
{ {
if (window->type == WIN_MUC) { if (window->type == WIN_MUC) {
ProfMucWin *mucwin = (ProfMucWin*)window; ProfMucWin *mucwin = (ProfMucWin*)window;
@@ -708,7 +705,7 @@ muc_autocomplete(ProfWin *window, const char * const input)
} }
void void
muc_jid_autocomplete_reset(const char * const room) muc_jid_autocomplete_reset(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -719,7 +716,7 @@ muc_jid_autocomplete_reset(const char * const room)
} }
void void
muc_jid_autocomplete_add_all(const char * const room, GSList *jids) muc_jid_autocomplete_add_all(const char *const room, GSList *jids)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -741,7 +738,7 @@ muc_jid_autocomplete_add_all(const char * const room, GSList *jids)
} }
void void
muc_autocomplete_reset(const char * const room) muc_autocomplete_reset(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -756,8 +753,8 @@ muc_autocomplete_reset(const char * const room)
} }
} }
char * char*
muc_role_str(const char * const room) muc_role_str(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -768,7 +765,7 @@ muc_role_str(const char * const room)
} }
void void
muc_set_role(const char * const room, const char * const role) muc_set_role(const char *const room, const char *const role)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -776,8 +773,8 @@ muc_set_role(const char * const room, const char * const role)
} }
} }
char * char*
muc_affiliation_str(const char * const room) muc_affiliation_str(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -788,7 +785,7 @@ muc_affiliation_str(const char * const room)
} }
void void
muc_set_affiliation(const char * const room, const char * const affiliation) muc_set_affiliation(const char *const room, const char *const affiliation)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -797,7 +794,7 @@ muc_set_affiliation(const char * const room, const char * const affiliation)
} }
muc_member_type_t muc_member_type_t
muc_member_type(const char * const room) muc_member_type(const char *const room)
{ {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room); ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room) { if (chat_room) {
@@ -832,8 +829,8 @@ _free_room(ChatRoom *room)
} }
} }
static static gint
gint _compare_occupants(Occupant *a, Occupant *b) _compare_occupants(Occupant *a, Occupant *b)
{ {
const char * utf8_str_a = a->nick_collate_key; const char * utf8_str_a = a->nick_collate_key;
const char * utf8_str_b = b->nick_collate_key; const char * utf8_str_b = b->nick_collate_key;
@@ -844,7 +841,7 @@ gint _compare_occupants(Occupant *a, Occupant *b)
} }
static muc_role_t static muc_role_t
_role_from_string(const char * const role) _role_from_string(const char *const role)
{ {
if (role) { if (role) {
if (g_strcmp0(role, "visitor") == 0) { if (g_strcmp0(role, "visitor") == 0) {
@@ -861,7 +858,7 @@ _role_from_string(const char * const role)
} }
} }
static char * static char*
_role_to_string(muc_role_t role) _role_to_string(muc_role_t role)
{ {
char *result = NULL; char *result = NULL;
@@ -888,7 +885,7 @@ _role_to_string(muc_role_t role)
} }
static muc_affiliation_t static muc_affiliation_t
_affiliation_from_string(const char * const affiliation) _affiliation_from_string(const char *const affiliation)
{ {
if (affiliation) { if (affiliation) {
if (g_strcmp0(affiliation, "outcast") == 0) { if (g_strcmp0(affiliation, "outcast") == 0) {
@@ -907,7 +904,7 @@ _affiliation_from_string(const char * const affiliation)
} }
} }
static char * static char*
_affiliation_to_string(muc_affiliation_t affiliation) _affiliation_to_string(muc_affiliation_t affiliation)
{ {
char *result = NULL; char *result = NULL;
@@ -937,8 +934,8 @@ _affiliation_to_string(muc_affiliation_t affiliation)
} }
static Occupant* static Occupant*
_muc_occupant_new(const char *const nick, const char * const jid, muc_role_t role, muc_affiliation_t affiliation, resource_presence_t presence, _muc_occupant_new(const char *const nick, const char *const jid, muc_role_t role, muc_affiliation_t affiliation,
const char * const status) resource_presence_t presence, const char *const status)
{ {
Occupant *occupant = malloc(sizeof(Occupant)); Occupant *occupant = malloc(sizeof(Occupant));

7
src/muc.h
View File

@@ -96,9 +96,8 @@ char* muc_old_nick(const char *const room, const char *const new_nick);
gboolean muc_roster_contains_nick(const char *const room, const char *const nick); gboolean muc_roster_contains_nick(const char *const room, const char *const nick);
gboolean muc_roster_complete(const char *const room); gboolean muc_roster_complete(const char *const room);
gboolean muc_roster_add(const char *const room, const char *const nick, const char *const jid, gboolean muc_roster_add(const char *const room, const char *const nick, const char *const jid, const char *const role,
const char *const role, const char *const affiliation, const char *const show, const char *const affiliation, const char *const show, const char *const status);
const char *const status);
void muc_roster_remove(const char *const room, const char *const nick); void muc_roster_remove(const char *const room, const char *const nick);
void muc_roster_set_complete(const char *const room); void muc_roster_set_complete(const char *const room);
GList* muc_roster(const char *const room); GList* muc_roster(const char *const room);
@@ -107,7 +106,7 @@ Autocomplete muc_roster_jid_ac(const char *const room);
void muc_jid_autocomplete_reset(const char *const room); void muc_jid_autocomplete_reset(const char *const room);
void muc_jid_autocomplete_add_all(const char *const room, GSList *jids); void muc_jid_autocomplete_add_all(const char *const room, GSList *jids);
Occupant * muc_roster_item(const char *const room, const char *const nick); Occupant* muc_roster_item(const char *const room, const char *const nick);
gboolean muc_occupant_available(Occupant *occupant); gboolean muc_occupant_available(Occupant *occupant);
const char* muc_occupant_affiliation_str(Occupant *occupant); const char* muc_occupant_affiliation_str(Occupant *occupant);

4
src/profanity.c
View File

@@ -162,7 +162,7 @@ prof_handle_activity(void)
} }
static void static void
_connect_default(const char * const account) _connect_default(const char *const account)
{ {
ProfWin *window = wins_get_current(); ProfWin *window = wins_get_current();
if (account) { if (account) {
@@ -177,7 +177,7 @@ _connect_default(const char * const account)
} }
static void static void
_check_autoaway() _check_autoaway(void)
{ {
jabber_conn_status_t conn_status = jabber_get_connection_status(); jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {

7
src/resource.c
View File

@@ -39,8 +39,8 @@
#include <common.h> #include <common.h>
#include <resource.h> #include <resource.h>
Resource * resource_new(const char * const name, resource_presence_t presence, Resource*
const char * const status, const int priority) resource_new(const char *const name, resource_presence_t presence, const char *const status, const int priority)
{ {
assert(name != NULL); assert(name != NULL);
Resource *new_resource = malloc(sizeof(struct resource_t)); Resource *new_resource = malloc(sizeof(struct resource_t));
@@ -86,7 +86,8 @@ resource_compare_availability(Resource *first, Resource *second)
} }
} }
void resource_destroy(Resource *resource) void
resource_destroy(Resource *resource)
{ {
if (resource) { if (resource) {
free(resource->name); free(resource->name);

5
src/resource.h
View File

@@ -44,10 +44,9 @@ typedef struct resource_t {
int priority; int priority;
} Resource; } Resource;
Resource* resource_new(const char *const name, resource_presence_t presence, Resource* resource_new(const char *const name, resource_presence_t presence, const char *const status,
const char *const status, const int priority); const int priority);
void resource_destroy(Resource *resource); void resource_destroy(Resource *resource);
int resource_compare_availability(Resource *first, Resource *second); int resource_compare_availability(Resource *first, Resource *second);
#endif #endif

79
src/roster_list.c
View File

@@ -64,10 +64,8 @@ static GHashTable *name_to_barejid;
static gboolean _key_equals(void *key1, void *key2); static gboolean _key_equals(void *key1, void *key2);
static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2); static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2);
static void _replace_name(const char * const current_name, static void _replace_name(const char *const current_name, const char *const new_name, const char *const barejid);
const char * const new_name, const char * const barejid); static void _add_name_and_barejid(const char *const name, const char *const barejid);
static void _add_name_and_barejid(const char * const name,
const char * const barejid);
static gint _compare_contacts(PContact a, PContact b); static gint _compare_contacts(PContact a, PContact b);
void void
@@ -86,8 +84,7 @@ roster_clear(void)
} }
gboolean gboolean
roster_update_presence(const char * const barejid, Resource *resource, roster_update_presence(const char *const barejid, Resource *resource, GDateTime *last_activity)
GDateTime *last_activity)
{ {
assert(barejid != NULL); assert(barejid != NULL);
assert(resource != NULL); assert(resource != NULL);
@@ -108,7 +105,7 @@ roster_update_presence(const char * const barejid, Resource *resource,
} }
PContact PContact
roster_get_contact(const char * const barejid) roster_get_contact(const char *const barejid)
{ {
gchar *barejidlower = g_utf8_strdown(barejid, -1); gchar *barejidlower = g_utf8_strdown(barejid, -1);
PContact contact = g_hash_table_lookup(contacts, barejidlower); PContact contact = g_hash_table_lookup(contacts, barejidlower);
@@ -117,8 +114,8 @@ roster_get_contact(const char * const barejid)
return contact; return contact;
} }
char * char*
roster_get_msg_display_name(const char * const barejid, const char * const resource) roster_get_msg_display_name(const char *const barejid, const char *const resource)
{ {
GString *result = g_string_new(""); GString *result = g_string_new("");
@@ -145,8 +142,7 @@ roster_get_msg_display_name(const char * const barejid, const char * const resou
} }
gboolean gboolean
roster_contact_offline(const char * const barejid, roster_contact_offline(const char *const barejid, const char *const resource, const char *const status)
const char * const resource, const char * const status)
{ {
PContact contact = roster_get_contact(barejid); PContact contact = roster_get_contact(barejid);
@@ -199,7 +195,7 @@ roster_free(void)
} }
void void
roster_change_name(PContact contact, const char * const new_name) roster_change_name(PContact contact, const char *const new_name)
{ {
assert(contact != NULL); assert(contact != NULL);
@@ -215,7 +211,7 @@ roster_change_name(PContact contact, const char * const new_name)
} }
void void
roster_remove(const char * const name, const char * const barejid) roster_remove(const char *const name, const char *const barejid)
{ {
autocomplete_remove(barejid_ac, barejid); autocomplete_remove(barejid_ac, barejid);
autocomplete_remove(name_ac, name); autocomplete_remove(name_ac, name);
@@ -241,8 +237,8 @@ roster_remove(const char * const name, const char * const barejid)
} }
void void
roster_update(const char * const barejid, const char * const name, roster_update(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
GSList *groups, const char * const subscription, gboolean pending_out) gboolean pending_out)
{ {
PContact contact = roster_get_contact(barejid); PContact contact = roster_get_contact(barejid);
assert(contact != NULL); assert(contact != NULL);
@@ -268,8 +264,8 @@ roster_update(const char * const barejid, const char * const name,
} }
gboolean gboolean
roster_add(const char * const barejid, const char * const name, GSList *groups, roster_add(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
const char * const subscription, gboolean pending_out) gboolean pending_out)
{ {
PContact contact = roster_get_contact(barejid); PContact contact = roster_get_contact(barejid);
if (contact) { if (contact) {
@@ -292,8 +288,8 @@ roster_add(const char * const barejid, const char * const name, GSList *groups,
return TRUE; return TRUE;
} }
char * char*
roster_barejid_from_name(const char * const name) roster_barejid_from_name(const char *const name)
{ {
if (name) { if (name) {
return g_hash_table_lookup(name_to_barejid, name); return g_hash_table_lookup(name_to_barejid, name);
@@ -302,8 +298,8 @@ roster_barejid_from_name(const char * const name)
} }
} }
GSList * GSList*
roster_get_contacts_by_presence(const char * const presence) roster_get_contacts_by_presence(const char *const presence)
{ {
GSList *result = NULL; GSList *result = NULL;
GHashTableIter iter; GHashTableIter iter;
@@ -322,7 +318,7 @@ roster_get_contacts_by_presence(const char * const presence)
return result; return result;
} }
GSList * GSList*
roster_get_contacts(void) roster_get_contacts(void)
{ {
GSList *result = NULL; GSList *result = NULL;
@@ -339,7 +335,7 @@ roster_get_contacts(void)
return result; return result;
} }
GSList * GSList*
roster_get_contacts_online(void) roster_get_contacts_online(void)
{ {
GSList *result = NULL; GSList *result = NULL;
@@ -375,19 +371,19 @@ roster_has_pending_subscriptions(void)
return FALSE; return FALSE;
} }
char * char*
roster_contact_autocomplete(const char * const search_str) roster_contact_autocomplete(const char *const search_str)
{ {
return autocomplete_complete(name_ac, search_str, TRUE); return autocomplete_complete(name_ac, search_str, TRUE);
} }
char * char*
roster_fulljid_autocomplete(const char * const search_str) roster_fulljid_autocomplete(const char *const search_str)
{ {
return autocomplete_complete(fulljid_ac, search_str, TRUE); return autocomplete_complete(fulljid_ac, search_str, TRUE);
} }
GSList * GSList*
roster_get_nogroup(void) roster_get_nogroup(void)
{ {
GSList *result = NULL; GSList *result = NULL;
@@ -407,8 +403,8 @@ roster_get_nogroup(void)
return result; return result;
} }
GSList * GSList*
roster_get_group(const char * const group) roster_get_group(const char *const group)
{ {
GSList *result = NULL; GSList *result = NULL;
GHashTableIter iter; GHashTableIter iter;
@@ -431,26 +427,26 @@ roster_get_group(const char * const group)
return result; return result;
} }
GSList * GSList*
roster_get_groups(void) roster_get_groups(void)
{ {
return autocomplete_create_list(groups_ac); return autocomplete_create_list(groups_ac);
} }
char * char*
roster_group_autocomplete(const char * const search_str) roster_group_autocomplete(const char *const search_str)
{ {
return autocomplete_complete(groups_ac, search_str, TRUE); return autocomplete_complete(groups_ac, search_str, TRUE);
} }
char * char*
roster_barejid_autocomplete(const char * const search_str) roster_barejid_autocomplete(const char *const search_str)
{ {
return autocomplete_complete(barejid_ac, search_str, TRUE); return autocomplete_complete(barejid_ac, search_str, TRUE);
} }
static static gboolean
gboolean _key_equals(void *key1, void *key2) _key_equals(void *key1, void *key2)
{ {
gchar *str1 = (gchar *) key1; gchar *str1 = (gchar *) key1;
gchar *str2 = (gchar *) key2; gchar *str2 = (gchar *) key2;
@@ -473,8 +469,7 @@ _datetimes_equal(GDateTime *dt1, GDateTime *dt2)
} }
static void static void
_replace_name(const char * const current_name, const char * const new_name, _replace_name(const char *const current_name, const char *const new_name, const char *const barejid)
const char * const barejid)
{ {
// current handle exists already // current handle exists already
if (current_name) { if (current_name) {
@@ -490,7 +485,7 @@ _replace_name(const char * const current_name, const char * const new_name,
} }
static void static void
_add_name_and_barejid(const char * const name, const char * const barejid) _add_name_and_barejid(const char *const name, const char *const barejid)
{ {
if (name) { if (name) {
autocomplete_add(name_ac, name); autocomplete_add(name_ac, name);
@@ -501,8 +496,8 @@ _add_name_and_barejid(const char * const name, const char * const barejid)
} }
} }
static static gint
gint _compare_contacts(PContact a, PContact b) _compare_contacts(PContact a, PContact b)
{ {
const char * utf8_str_a = NULL; const char * utf8_str_a = NULL;
const char * utf8_str_b = NULL; const char * utf8_str_b = NULL;

14
src/roster_list.h
View File

@@ -41,20 +41,18 @@
#include "contact.h" #include "contact.h"
void roster_clear(void); void roster_clear(void);
gboolean roster_update_presence(const char *const barejid, Resource *resource, gboolean roster_update_presence(const char *const barejid, Resource *resource, GDateTime *last_activity);
GDateTime *last_activity);
PContact roster_get_contact(const char *const barejid); PContact roster_get_contact(const char *const barejid);
gboolean roster_contact_offline(const char *const barejid, gboolean roster_contact_offline(const char *const barejid, const char *const resource, const char *const status);
const char *const resource, const char *const status);
void roster_reset_search_attempts(void); void roster_reset_search_attempts(void);
void roster_init(void); void roster_init(void);
void roster_free(void); void roster_free(void);
void roster_change_name(PContact contact, const char *const new_name); void roster_change_name(PContact contact, const char *const new_name);
void roster_remove(const char *const name, const char *const barejid); void roster_remove(const char *const name, const char *const barejid);
void roster_update(const char *const barejid, const char *const name, void roster_update(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
GSList *groups, const char *const subscription, gboolean pending_out); gboolean pending_out);
gboolean roster_add(const char *const barejid, const char *const name, GSList *groups, gboolean roster_add(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
const char *const subscription, gboolean pending_out); gboolean pending_out);
char* roster_barejid_from_name(const char *const name); char* roster_barejid_from_name(const char *const name);
GSList* roster_get_contacts(void); GSList* roster_get_contacts(void);
GSList* roster_get_contacts_online(void); GSList* roster_get_contacts_online(void);

54
src/window_list.c
View File

@@ -63,14 +63,14 @@ wins_init(void)
current = 1; current = 1;
} }
ProfWin * ProfWin*
wins_get_console(void) wins_get_console(void)
{ {
return g_hash_table_lookup(windows, GINT_TO_POINTER(1)); return g_hash_table_lookup(windows, GINT_TO_POINTER(1));
} }
ProfChatWin * ProfChatWin*
wins_get_chat(const char * const barejid) wins_get_chat(const char *const barejid)
{ {
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
GList *curr = values; GList *curr = values;
@@ -91,8 +91,8 @@ wins_get_chat(const char * const barejid)
return NULL; return NULL;
} }
ProfMucConfWin * ProfMucConfWin*
wins_get_muc_conf(const char * const roomjid) wins_get_muc_conf(const char *const roomjid)
{ {
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
GList *curr = values; GList *curr = values;
@@ -113,8 +113,8 @@ wins_get_muc_conf(const char * const roomjid)
return NULL; return NULL;
} }
ProfMucWin * ProfMucWin*
wins_get_muc(const char * const roomjid) wins_get_muc(const char *const roomjid)
{ {
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
GList *curr = values; GList *curr = values;
@@ -135,8 +135,8 @@ wins_get_muc(const char * const roomjid)
return NULL; return NULL;
} }
ProfPrivateWin * ProfPrivateWin*
wins_get_private(const char * const fulljid) wins_get_private(const char *const fulljid)
{ {
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
GList *curr = values; GList *curr = values;
@@ -157,7 +157,7 @@ wins_get_private(const char * const fulljid)
return NULL; return NULL;
} }
ProfWin * ProfWin*
wins_get_current(void) wins_get_current(void)
{ {
if (windows) { if (windows) {
@@ -167,7 +167,7 @@ wins_get_current(void)
} }
} }
GList * GList*
wins_get_nums(void) wins_get_nums(void)
{ {
return g_hash_table_get_keys(windows); return g_hash_table_get_keys(windows);
@@ -194,13 +194,13 @@ wins_set_current_by_num(int i)
} }
} }
ProfWin * ProfWin*
wins_get_by_num(int i) wins_get_by_num(int i)
{ {
return g_hash_table_lookup(windows, GINT_TO_POINTER(i)); return g_hash_table_lookup(windows, GINT_TO_POINTER(i));
} }
ProfWin * ProfWin*
wins_get_next(void) wins_get_next(void)
{ {
// get and sort win nums // get and sort win nums
@@ -229,7 +229,7 @@ wins_get_next(void)
} }
} }
ProfWin * ProfWin*
wins_get_previous(void) wins_get_previous(void)
{ {
// get and sort win nums // get and sort win nums
@@ -321,7 +321,7 @@ wins_is_current(ProfWin *window)
} }
} }
ProfWin * ProfWin*
wins_new_xmlconsole(void) wins_new_xmlconsole(void)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
@@ -332,8 +332,8 @@ wins_new_xmlconsole(void)
return newwin; return newwin;
} }
ProfWin * ProfWin*
wins_new_chat(const char * const barejid) wins_new_chat(const char *const barejid)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
int result = get_next_available_win_num(keys); int result = get_next_available_win_num(keys);
@@ -343,8 +343,8 @@ wins_new_chat(const char * const barejid)
return newwin; return newwin;
} }
ProfWin * ProfWin*
wins_new_muc(const char * const roomjid) wins_new_muc(const char *const roomjid)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
int result = get_next_available_win_num(keys); int result = get_next_available_win_num(keys);
@@ -354,8 +354,8 @@ wins_new_muc(const char * const roomjid)
return newwin; return newwin;
} }
ProfWin * ProfWin*
wins_new_muc_config(const char * const roomjid, DataForm *form) wins_new_muc_config(const char *const roomjid, DataForm *form)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
int result = get_next_available_win_num(keys); int result = get_next_available_win_num(keys);
@@ -365,8 +365,8 @@ wins_new_muc_config(const char * const roomjid, DataForm *form)
return newwin; return newwin;
} }
ProfWin * ProfWin*
wins_new_private(const char * const fulljid) wins_new_private(const char *const fulljid)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
int result = get_next_available_win_num(keys); int result = get_next_available_win_num(keys);
@@ -426,7 +426,7 @@ wins_show_subwin(ProfWin *window)
win_refresh_with_subwin(current_win); win_refresh_with_subwin(current_win);
} }
ProfXMLWin * ProfXMLWin*
wins_get_xmlconsole(void) wins_get_xmlconsole(void)
{ {
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
@@ -447,7 +447,7 @@ wins_get_xmlconsole(void)
return NULL; return NULL;
} }
GSList * GSList*
wins_get_chat_recipients(void) wins_get_chat_recipients(void)
{ {
GSList *result = NULL; GSList *result = NULL;
@@ -466,7 +466,7 @@ wins_get_chat_recipients(void)
return result; return result;
} }
GSList * GSList*
wins_get_prune_wins(void) wins_get_prune_wins(void)
{ {
GSList *result = NULL; GSList *result = NULL;
@@ -620,7 +620,7 @@ wins_tidy(void)
} }
} }
GSList * GSList*
wins_create_summary(void) wins_create_summary(void)
{ {
GSList *result = NULL; GSList *result = NULL;