From 107fdd355e487793e53799ce3ebed0659263a2f7 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 14 Dec 2013 15:34:17 +0000 Subject: Added simple mock test, refactored roster --- src/xmpp/bookmark.h | 9 +- src/xmpp/capabilities.h | 4 +- src/xmpp/connection.h | 4 +- src/xmpp/iq.c | 1 + src/xmpp/iq.h | 4 +- src/xmpp/message.c | 1 + src/xmpp/message.h | 4 +- src/xmpp/presence.h | 4 +- src/xmpp/roster.c | 531 ++++++------------------------------------------ src/xmpp/roster.h | 4 +- src/xmpp/stanza.h | 4 +- src/xmpp/xmpp.h | 40 ++-- 12 files changed, 87 insertions(+), 523 deletions(-) (limited to 'src/xmpp') diff --git a/src/xmpp/bookmark.h b/src/xmpp/bookmark.h index e15b6eab..8b5418b0 100644 --- a/src/xmpp/bookmark.h +++ b/src/xmpp/bookmark.h @@ -1,6 +1,6 @@ -#ifndef BOOKMARK_H -#define BOOKMARK_H +#ifndef XMPP_BOOKMARK_H +#define XMPP_BOOKMARK_H #include @@ -13,10 +13,5 @@ struct bookmark_t { typedef struct bookmark_t Bookmark; void bookmark_request(void); -void bookmark_add(const char *jid, const char *nick, gboolean autojoin); -void bookmark_remove(const char *jid, gboolean autojoin); -const GList *bookmark_get_list(void); -char *bookmark_find(char *search_str); -void bookmark_autocomplete_reset(void); #endif diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h index d97b84b2..45d97e0f 100644 --- a/src/xmpp/capabilities.h +++ b/src/xmpp/capabilities.h @@ -20,8 +20,8 @@ * */ -#ifndef CAPABILITIES_H -#define CAPABILITIES_H +#ifndef XMPP_CAPABILITIES_H +#define XMPP_CAPABILITIES_H #include diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h index b5701252..f11bc8c8 100644 --- a/src/xmpp/connection.h +++ b/src/xmpp/connection.h @@ -20,8 +20,8 @@ * */ -#ifndef CONNECTION_H -#define CONNECTION_H +#ifndef XMPP_CONNECTION_H +#define XMPP_CONNECTION_H #include diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 1ddfcb34..fdabe771 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -38,6 +38,7 @@ #include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" +#include "roster_list.h" #include "xmpp/xmpp.h" #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_IQ, type, ctx) diff --git a/src/xmpp/iq.h b/src/xmpp/iq.h index 86966e26..64844228 100644 --- a/src/xmpp/iq.h +++ b/src/xmpp/iq.h @@ -20,8 +20,8 @@ * */ -#ifndef IQ_H -#define IQ_H +#ifndef XMPP_IQ_H +#define XMPP_IQ_H void iq_add_handlers(void); void iq_roster_request(void); diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 8a977490..a1644587 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -33,6 +33,7 @@ #include "xmpp/connection.h" #include "xmpp/message.h" #include "xmpp/roster.h" +#include "roster_list.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" diff --git a/src/xmpp/message.h b/src/xmpp/message.h index 639ae558..3bfa60ef 100644 --- a/src/xmpp/message.h +++ b/src/xmpp/message.h @@ -20,8 +20,8 @@ * */ -#ifndef MESSAGE_H -#define MESSAGE_H +#ifndef XMPP_MESSAGE_H +#define XMPP_MESSAGE_H void message_add_handlers(void); diff --git a/src/xmpp/presence.h b/src/xmpp/presence.h index fa63d78e..fb13a699 100644 --- a/src/xmpp/presence.h +++ b/src/xmpp/presence.h @@ -20,8 +20,8 @@ * */ -#ifndef PRESENCE_H -#define PRESENCE_H +#ifndef XMPP_PRESENCE_H +#define XMPP_PRESENCE_H void presence_sub_requests_init(void); void presence_add_handlers(void); diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 5fbb7be7..51c34ea1 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -32,30 +32,13 @@ #include "tools/autocomplete.h" #include "xmpp/connection.h" #include "xmpp/roster.h" +#include "roster_list.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" #define HANDLE(type, func) xmpp_handler_add(conn, func, XMPP_NS_ROSTER, \ STANZA_NAME_IQ, type, ctx) -// nicknames -static Autocomplete name_ac; - -// barejids -static Autocomplete barejid_ac; - -// fulljids -static Autocomplete fulljid_ac; - -// groups -static Autocomplete groups_ac; - -// contacts, indexed on barejid -static GHashTable *contacts; - -// nickname to jid map -static GHashTable *name_to_barejid; - // callback data for group commands typedef struct _group_data { char *name; @@ -77,14 +60,7 @@ _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata); // helper functions -static void _add_name_and_barejid(const char * const name, - const char * const barejid); -static void _replace_name(const char * const current_name, - const char * const new_name, const char * const barejid); GSList * _get_groups_from_item(xmpp_stanza_t *item); -static gboolean _key_equals(void *key1, void *key2); -static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2); -static gint _compare_contacts(PContact a, PContact b); void roster_add_handlers(void) @@ -105,52 +81,6 @@ roster_request(void) xmpp_stanza_release(iq); } -void -roster_init(void) -{ - name_ac = autocomplete_new(); - barejid_ac = autocomplete_new(); - fulljid_ac = autocomplete_new(); - groups_ac = autocomplete_new(); - contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free, - (GDestroyNotify)p_contact_free); - name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, - g_free); -} - -void -roster_clear(void) -{ - autocomplete_clear(name_ac); - autocomplete_clear(barejid_ac); - autocomplete_clear(fulljid_ac); - autocomplete_clear(groups_ac); - g_hash_table_destroy(contacts); - contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free, - (GDestroyNotify)p_contact_free); - g_hash_table_destroy(name_to_barejid); - name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, - g_free); -} - -void -roster_free() -{ - autocomplete_free(name_ac); - autocomplete_free(barejid_ac); - autocomplete_free(fulljid_ac); - autocomplete_free(groups_ac); -} - -void -roster_reset_search_attempts(void) -{ - autocomplete_reset(name_ac); - autocomplete_reset(barejid_ac); - autocomplete_reset(fulljid_ac); - autocomplete_reset(groups_ac); -} - void roster_add_new(const char * const barejid, const char * const name) { @@ -162,7 +92,7 @@ roster_add_new(const char * const barejid, const char * const name) } void -roster_remove(const char * const barejid) +roster_send_remove(const char * const barejid) { xmpp_conn_t * const conn = connection_get_conn(); xmpp_ctx_t * const ctx = connection_get_ctx(); @@ -171,180 +101,46 @@ roster_remove(const char * const barejid) xmpp_stanza_release(iq); } -gboolean -roster_add(const char * const barejid, const char * const name, GSList *groups, - const char * const subscription, gboolean pending_out, gboolean from_initial) -{ - gboolean added = FALSE; - PContact contact = g_hash_table_lookup(contacts, barejid); - - if (contact == NULL) { - contact = p_contact_new(barejid, name, groups, subscription, NULL, - pending_out); - - // add groups - while (groups != NULL) { - autocomplete_add(groups_ac, groups->data); - groups = g_slist_next(groups); - } - - g_hash_table_insert(contacts, strdup(barejid), contact); - autocomplete_add(barejid_ac, barejid); - _add_name_and_barejid(name, barejid); - - if (!from_initial) { - prof_handle_roster_add(barejid, name); - } - - added = TRUE; - } - - return added; -} - void -roster_update(const char * const barejid, const char * const name, - GSList *groups, const char * const subscription, gboolean pending_out) -{ - PContact contact = g_hash_table_lookup(contacts, barejid); - - if (contact == NULL) { - roster_add(barejid, name, groups, subscription, pending_out, FALSE); - } else { - p_contact_set_subscription(contact, subscription); - p_contact_set_pending_out(contact, pending_out); - - const char * const new_name = name; - const char * current_name = NULL; - if (p_contact_name(contact) != NULL) { - current_name = strdup(p_contact_name(contact)); - } - - p_contact_set_name(contact, new_name); - p_contact_set_groups(contact, groups); - _replace_name(current_name, new_name, barejid); - - // add groups - while (groups != NULL) { - autocomplete_add(groups_ac, groups->data); - groups = g_slist_next(groups); - } - } -} - -gboolean -roster_update_presence(const char * const barejid, Resource *resource, - GDateTime *last_activity) +roster_send_name_change(const char * const barejid, const char * const new_name, GSList *groups) { - assert(barejid != NULL); - assert(resource != NULL); - - PContact contact = g_hash_table_lookup(contacts, barejid); - if (contact == NULL) { - return FALSE; - } - if (!_datetimes_equal(p_contact_last_activity(contact), last_activity)) { - p_contact_set_last_activity(contact, last_activity); - } - p_contact_set_presence(contact, resource); - Jid *jid = jid_create_from_bare_and_resource(barejid, resource->name); - autocomplete_add(fulljid_ac, jid->fulljid); - jid_destroy(jid); - - return TRUE; -} - -gboolean -roster_contact_offline(const char * const barejid, - const char * const resource, const char * const status) -{ - PContact contact = g_hash_table_lookup(contacts, barejid); - - if (contact == NULL) { - return FALSE; - } - if (resource == NULL) { - return TRUE; - } else { - gboolean result = p_contact_remove_resource(contact, resource); - if (result == TRUE) { - Jid *jid = jid_create_from_bare_and_resource(barejid, resource); - autocomplete_remove(fulljid_ac, jid->fulljid); - jid_destroy(jid); - } - - return result; - } + xmpp_conn_t * const conn = connection_get_conn(); + xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_stanza_t *iq = stanza_create_roster_set(ctx, NULL, barejid, new_name, + groups); + xmpp_send(conn, iq); + xmpp_stanza_release(iq); } void -roster_change_name(const char * const barejid, const char * const new_name) +roster_send_add_to_group(const char * const group, PContact contact) { - PContact contact = g_hash_table_lookup(contacts, barejid); - const char * current_name = NULL; - if (p_contact_name(contact) != NULL) { - current_name = strdup(p_contact_name(contact)); + GSList *groups = p_contact_groups(contact); + GSList *new_groups = NULL; + while (groups != NULL) { + new_groups = g_slist_append(new_groups, strdup(groups->data)); + groups = g_slist_next(groups); } - if (contact != NULL) { - p_contact_set_name(contact, new_name); - _replace_name(current_name, new_name, barejid); - - GSList *groups = p_contact_groups(contact); - - xmpp_conn_t * const conn = connection_get_conn(); - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_roster_set(ctx, NULL, barejid, new_name, - groups); - xmpp_send(conn, iq); - xmpp_stanza_release(iq); + new_groups = g_slist_append(new_groups, strdup(group)); + // add an id handler to handle the response + char *unique_id = get_unique_id(); + GroupData *data = malloc(sizeof(GroupData)); + data->group = strdup(group); + if (p_contact_name(contact) != NULL) { + data->name = strdup(p_contact_name(contact)); + } else { + data->name = strdup(p_contact_barejid(contact)); } -} - -void -roster_add_to_group(const char * const group, const char * const barejid) -{ - PContact contact = g_hash_table_lookup(contacts, barejid); - - if (contact != NULL) { - if (p_contact_in_group(contact, group)) { - if (p_contact_name(contact) != NULL) { - prof_handle_already_in_group(p_contact_name(contact), group); - } else { - prof_handle_already_in_group(p_contact_barejid(contact), group); - } - return; - } - - GSList *groups = p_contact_groups(contact); - GSList *new_groups = NULL; - while (groups != NULL) { - new_groups = g_slist_append(new_groups, strdup(groups->data)); - groups = g_slist_next(groups); - } - new_groups = g_slist_append(new_groups, strdup(group)); - - xmpp_conn_t * const conn = connection_get_conn(); - xmpp_ctx_t * const ctx = connection_get_ctx(); - - // add an id handler to handle the response - char *unique_id = get_unique_id(); - GroupData *data = malloc(sizeof(GroupData)); - data->group = strdup(group); - if (p_contact_name(contact) != NULL) { - data->name = strdup(p_contact_name(contact)); - } else { - data->name = strdup(p_contact_barejid(contact)); - } - - xmpp_id_handler_add(conn, _group_add_handler, unique_id, data); - xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, barejid, - p_contact_name(contact), new_groups); - xmpp_send(conn, iq); - xmpp_stanza_release(iq); - free(unique_id); - } + xmpp_conn_t * const conn = connection_get_conn(); + xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_id_handler_add(conn, _group_add_handler, unique_id, data); + xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact), + p_contact_name(contact), new_groups); + xmpp_send(conn, iq); + xmpp_stanza_release(iq); + free(unique_id); } static int @@ -362,50 +158,36 @@ _group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, } void -roster_remove_from_group(const char * const group, const char * const barejid) +roster_send_remove_from_group(const char * const group, PContact contact) { - PContact contact = g_hash_table_lookup(contacts, barejid); - - if (contact != NULL) { - if (!p_contact_in_group(contact, group)) { - if (p_contact_name(contact) != NULL) { - prof_handle_not_in_group(p_contact_name(contact), group); - } else { - prof_handle_not_in_group(p_contact_barejid(contact), group); - } - return; - } - - GSList *groups = p_contact_groups(contact); - GSList *new_groups = NULL; - while (groups != NULL) { - if (strcmp(groups->data, group) != 0) { - new_groups = g_slist_append(new_groups, strdup(groups->data)); - } - groups = g_slist_next(groups); + GSList *groups = p_contact_groups(contact); + GSList *new_groups = NULL; + while (groups != NULL) { + if (strcmp(groups->data, group) != 0) { + new_groups = g_slist_append(new_groups, strdup(groups->data)); } + groups = g_slist_next(groups); + } - xmpp_conn_t * const conn = connection_get_conn(); - xmpp_ctx_t * const ctx = connection_get_ctx(); - - // add an id handler to handle the response - char *unique_id = get_unique_id(); - GroupData *data = malloc(sizeof(GroupData)); - data->group = strdup(group); - if (p_contact_name(contact) != NULL) { - data->name = strdup(p_contact_name(contact)); - } else { - data->name = strdup(p_contact_barejid(contact)); - } + xmpp_conn_t * const conn = connection_get_conn(); + xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_id_handler_add(conn, _group_remove_handler, unique_id, data); - xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, barejid, - p_contact_name(contact), new_groups); - xmpp_send(conn, iq); - xmpp_stanza_release(iq); - free(unique_id); + // add an id handler to handle the response + char *unique_id = get_unique_id(); + GroupData *data = malloc(sizeof(GroupData)); + data->group = strdup(group); + if (p_contact_name(contact) != NULL) { + data->name = strdup(p_contact_name(contact)); + } else { + data->name = strdup(p_contact_barejid(contact)); } + xmpp_id_handler_add(conn, _group_remove_handler, unique_id, data); + xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact), + p_contact_name(contact), new_groups); + xmpp_send(conn, iq); + xmpp_stanza_release(iq); + free(unique_id); } static int @@ -422,107 +204,6 @@ _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, return 0; } -gboolean -roster_has_pending_subscriptions(void) -{ - GHashTableIter iter; - gpointer key; - gpointer value; - - g_hash_table_iter_init(&iter, contacts); - while (g_hash_table_iter_next(&iter, &key, &value)) { - PContact contact = (PContact) value; - if (p_contact_pending_out(contact)) { - return TRUE; - } - } - - return FALSE; -} - -GSList * -roster_get_contacts(void) -{ - GSList *result = NULL; - GHashTableIter iter; - gpointer key; - gpointer value; - - g_hash_table_iter_init(&iter, contacts); - while (g_hash_table_iter_next(&iter, &key, &value)) { - result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts); - } - - // resturn all contact structs - return result; -} - -GSList * -roster_get_groups(void) -{ - return autocomplete_get_list(groups_ac); -} - -GSList * -roster_get_group(const char * const group) -{ - GSList *result = NULL; - GHashTableIter iter; - gpointer key; - gpointer value; - - g_hash_table_iter_init(&iter, contacts); - while (g_hash_table_iter_next(&iter, &key, &value)) { - GSList *groups = p_contact_groups(value); - while (groups != NULL) { - if (strcmp(groups->data, group) == 0) { - result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts); - break; - } - groups = g_slist_next(groups); - } - } - - // resturn all contact structs - return result; -} - -char * -roster_find_contact(char *search_str) -{ - return autocomplete_complete(name_ac, search_str); -} - -char * -roster_find_jid(char *search_str) -{ - return autocomplete_complete(barejid_ac, search_str); -} - -char * -roster_find_resource(char *search_str) -{ - return autocomplete_complete(fulljid_ac, search_str); -} - -char * -roster_find_group(char *search_str) -{ - return autocomplete_complete(groups_ac, search_str); -} - -char * -roster_barejid_from_name(const char * const name) -{ - return g_hash_table_lookup(name_to_barejid, name); -} - -PContact -roster_get_contact(const char * const barejid) -{ - return g_hash_table_lookup(contacts, barejid); -} - static int _roster_handle_push(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata) @@ -556,26 +237,8 @@ _roster_handle_push(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, if (name == NULL) { name = barejid; } - autocomplete_remove(barejid_ac, barejid); - autocomplete_remove(name_ac, name); - g_hash_table_remove(name_to_barejid, name); - - // remove each fulljid - PContact contact = roster_get_contact(barejid); - if (contact != NULL) { - GList *resources = p_contact_get_available_resources(contact); - while (resources != NULL) { - GString *fulljid = g_string_new(strdup(barejid)); - g_string_append(fulljid, "/"); - g_string_append(fulljid, resources->data); - autocomplete_remove(fulljid_ac, fulljid->str); - g_string_free(fulljid, TRUE); - resources = g_list_next(resources); - } - } - // remove the contact - g_hash_table_remove(contacts, barejid); + roster_remove(name, barejid); prof_handle_roster_remove(barejid); @@ -642,35 +305,6 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, return 1; } -static void -_add_name_and_barejid(const char * const name, const char * const barejid) -{ - if (name != NULL) { - autocomplete_add(name_ac, name); - g_hash_table_insert(name_to_barejid, strdup(name), strdup(barejid)); - } else { - autocomplete_add(name_ac, barejid); - g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid)); - } -} - -static void -_replace_name(const char * const current_name, const char * const new_name, - const char * const barejid) -{ - // current handle exists already - if (current_name != NULL) { - autocomplete_remove(name_ac, current_name); - g_hash_table_remove(name_to_barejid, current_name); - _add_name_and_barejid(new_name, barejid); - // no current handle - } else if (new_name != NULL) { - autocomplete_remove(name_ac, barejid); - g_hash_table_remove(name_to_barejid, barejid); - _add_name_and_barejid(new_name, barejid); - } -} - GSList * _get_groups_from_item(xmpp_stanza_t *item) { @@ -689,54 +323,3 @@ _get_groups_from_item(xmpp_stanza_t *item) return groups; } - -static -gboolean _key_equals(void *key1, void *key2) -{ - gchar *str1 = (gchar *) key1; - gchar *str2 = (gchar *) key2; - - return (g_strcmp0(str1, str2) == 0); -} - -static -gint _compare_contacts(PContact a, PContact b) -{ - const char * utf8_str_a = NULL; - const char * utf8_str_b = NULL; - - if (p_contact_name(a) != NULL) { - utf8_str_a = p_contact_name(a); - } else { - utf8_str_a = p_contact_barejid(a); - } - if (p_contact_name(b) != NULL) { - utf8_str_b = p_contact_name(b); - } else { - utf8_str_b = p_contact_barejid(b); - } - - gchar *key_a = g_utf8_collate_key(utf8_str_a, -1); - gchar *key_b = g_utf8_collate_key(utf8_str_b, -1); - - gint result = g_strcmp0(key_a, key_b); - - g_free(key_a); - g_free(key_b); - - return result; -} - -static gboolean -_datetimes_equal(GDateTime *dt1, GDateTime *dt2) -{ - if ((dt1 == NULL) && (dt2 == NULL)) { - return TRUE; - } else if ((dt1 == NULL) && (dt2 != NULL)) { - return FALSE; - } else if ((dt1 != NULL) && (dt2 == NULL)) { - return FALSE; - } else { - return g_date_time_equal(dt1, dt2); - } -} diff --git a/src/xmpp/roster.h b/src/xmpp/roster.h index 8aba28f4..1faaba86 100644 --- a/src/xmpp/roster.h +++ b/src/xmpp/roster.h @@ -20,8 +20,8 @@ * */ -#ifndef ROSTER_H -#define ROSTER_H +#ifndef XMPP_ROSTER_H +#define XMPP_ROSTER_H void roster_add_handlers(void); void roster_request(void); diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index 108b0806..6b647258 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -20,8 +20,8 @@ * */ -#ifndef STANZA_H -#define STANZA_H +#ifndef XMPP_STANZA_H +#define XMPP_STANZA_H #include diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index f1b3ba6c..21c25aa4 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -20,8 +20,8 @@ * */ -#ifndef XMPP_H -#define XMPP_H +#ifndef XMPP_XMPP_H +#define XMPP_XMPP_H #include @@ -124,32 +124,16 @@ void iq_disco_items_request(gchar *jid); Capabilities* caps_get(const char * const caps_str); void caps_close(void); -void roster_clear(void); -gboolean roster_update_presence(const char * const barejid, - Resource *resource, GDateTime *last_activity); -PContact roster_get_contact(const char * const barejid); -gboolean roster_contact_offline(const char * const barejid, - const char * const resource, const char * const status); -void roster_reset_search_attempts(void); -void roster_init(void); -void roster_free(void); -gboolean roster_has_pending_subscriptions(void); -GSList * roster_get_contacts(void); -char * roster_find_contact(char *search_str); -char * roster_find_jid(char *search_str); -char * roster_find_resource(char *search_str); -char * roster_find_group(char *search_str); -gboolean roster_add(const char * const barejid, const char * const name, - GSList *groups, const char * const subscription, gboolean pending_out, - gboolean from_initial); -void roster_change_name(const char * const barejid, const char * const new_name); -char * roster_barejid_from_name(const char * const name); +void bookmark_add(const char *jid, const char *nick, gboolean autojoin); +void bookmark_remove(const char *jid, gboolean autojoin); +const GList *bookmark_get_list(void); +char *bookmark_find(char *search_str); +void bookmark_autocomplete_reset(void); + +void roster_send_name_change(const char * const barejid, const char * const new_name, GSList *groups); +void roster_send_add_to_group(const char * const group, PContact contact); +void roster_send_remove_from_group(const char * const group, PContact contact); void roster_add_new(const char * const barejid, const char * const name); -void roster_remove(const char * const barejid); -GSList * roster_get_group(const char * const group); -void roster_add_to_group(const char * const group, const char * const barejid); -void roster_remove_from_group(const char * const group, - const char * const barejid); -GSList * roster_get_groups(void); +void roster_send_remove(const char * const barejid); #endif -- cgit 1.4.1-2-gfad0