aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

use get_unique_id for bookmarks

Browse Source
This commit is contained in:
Dmitry Podgorny 2013-07-14 13:49:50 +03:00
parent 2837c4054f
commit 034cf730cc
4 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common.c
View File

@ -37,9 +37,6 @@
// and page size is at least 4KB // and page size is at least 4KB
#define READ_BUF_SIZE 4088 #define READ_BUF_SIZE 4088
// for generating ids
static int unique_id = 0;
struct curl_data_t struct curl_data_t
{ {
char *buffer; char *buffer;
@ -400,10 +397,12 @@ xdg_get_data_home(void)
char * char *
get_unique_id(void) get_unique_id(void)
{ {
static unsigned long unique_id;
char *result = NULL; char *result = NULL;
unique_id++;
GString *result_str = g_string_new(""); GString *result_str = g_string_new("");
g_string_printf(result_str, "prof%d", unique_id);
unique_id++;
g_string_printf(result_str, "prof%lu", unique_id);
result = result_str->str; result = result_str->str;
g_string_free(result_str, FALSE); g_string_free(result_str, FALSE);

18
src/xmpp/bookmark.c
View File

@ -18,21 +18,25 @@ static int _bookmark_handle_result(xmpp_conn_t * const conn,
void void
bookmark_request(void) bookmark_request(void)
{ {
int id; char *id;
char id_str[10];
xmpp_conn_t * const conn = connection_get_conn(); xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx(); xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *iq = stanza_create_storage_bookmarks(ctx); xmpp_stanza_t *iq;
id = jabber_get_id(); id = get_unique_id();
snprintf(id_str, sizeof(id_str), "%u", id); if (!id) {
return;
}
/* TODO: timed handler to remove this id_handler */ /* TODO: timed handler to remove this id_handler */
xmpp_id_handler_add(conn, _bookmark_handle_result, id_str, ctx); xmpp_id_handler_add(conn, _bookmark_handle_result, id, ctx);
xmpp_stanza_set_id(iq, id_str); iq = stanza_create_storage_bookmarks(ctx);
xmpp_stanza_set_id(iq, id);
xmpp_send(conn, iq); xmpp_send(conn, iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
g_free(id);
} }
static int static int

13
src/xmpp/connection.c
View File

@ -232,19 +232,6 @@ jabber_set_autoping(const int seconds)
} }
} }
int
jabber_get_id(void)
{
static int xmpp_id;
++xmpp_id;
if (xmpp_id < 0) {
xmpp_id = 1;
}
return xmpp_id;
}
GList * GList *
jabber_get_available_resources(void) jabber_get_available_resources(void)
{ {

1
src/xmpp/connection.h
View File

@ -31,7 +31,6 @@ xmpp_conn_t *connection_get_conn(void);
xmpp_ctx_t *connection_get_ctx(void); xmpp_ctx_t *connection_get_ctx(void);
int connection_error_handler(xmpp_conn_t * const conn, int connection_error_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata); xmpp_stanza_t * const stanza, void * const userdata);
int jabber_get_id(void);
void connection_set_priority(int priority); void connection_set_priority(int priority);
void connection_set_presence_message(const char * const message); void connection_set_presence_message(const char * const message);
void connection_add_available_resource(Resource *resource); void connection_add_available_resource(Resource *resource);