aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Code

Rename self caps functions

Browse Source
This commit is contained in:
James Booth 2016-11-22 22:21:14 +00:00
parent e043029a50
commit c5176014e7
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/cmd_funcs.c
View File

@ -4570,10 +4570,10 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args)
if ((g_strcmp0(args[0], "on") == 0) || (g_strcmp0(args[0], "off") == 0)) {
_cmd_set_boolean_preference(args[0], command, "Last activity", PREF_LASTACTIVITY);
if (g_strcmp0(args[0], "on") == 0) {
caps_add_feature(XMPP_FEATURE_LASTACTIVITY);
caps_add_prof_feature(XMPP_FEATURE_LASTACTIVITY);
}
if (g_strcmp0(args[0], "off") == 0) {
caps_remove_feature(XMPP_FEATURE_LASTACTIVITY);
caps_remove_prof_feature(XMPP_FEATURE_LASTACTIVITY);
}
return TRUE;
}
@ -6163,10 +6163,10 @@ cmd_receipts(ProfWin *window, const char *const command, gchar **args)
if (g_strcmp0(args[0], "send") == 0) {
_cmd_set_boolean_preference(args[1], command, "Send delivery receipts", PREF_RECEIPTS_SEND);
if (g_strcmp0(args[1], "on") == 0) {
caps_add_feature(XMPP_FEATURE_RECEIPTS);
caps_add_prof_feature(XMPP_FEATURE_RECEIPTS);
}
if (g_strcmp0(args[1], "off") == 0) {
caps_remove_feature(XMPP_FEATURE_RECEIPTS);
caps_remove_prof_feature(XMPP_FEATURE_RECEIPTS);
}
} else if (g_strcmp0(args[0], "request") == 0) {
_cmd_set_boolean_preference(args[1], command, "Request delivery receipts", PREF_RECEIPTS_REQUEST);

6
src/xmpp/capabilities.c
View File

@ -112,7 +112,7 @@ caps_init(void)
}
void
caps_add_feature(char *feature)
caps_add_prof_feature(char *feature)
{
if (g_hash_table_contains(prof_features, feature)) {
return;
@ -130,7 +130,7 @@ caps_add_feature(char *feature)
}
void
caps_remove_feature(char *feature)
caps_remove_prof_feature(char *feature)
{
if (!g_hash_table_contains(prof_features, feature)) {
return;
@ -148,7 +148,7 @@ caps_remove_feature(char *feature)
}
GList*
caps_get_features(void)
caps_get_prof_features(void)
{
GList *result = NULL;

2
src/xmpp/capabilities.h
View File

@ -57,7 +57,7 @@ void caps_add_by_ver(const char *const ver, EntityCapabilities *caps);
void caps_add_by_jid(const char *const jid, EntityCapabilities *caps);
void caps_map_jid_to_ver(const char *const jid, const char *const ver);
gboolean caps_cache_contains(const char *const ver);
GList* caps_get_features(void);
GList* caps_get_prof_features(void);
char* caps_get_my_sha1(xmpp_ctx_t *const ctx);
#endif

2
src/xmpp/stanza.c
View File

@ -1006,7 +1006,7 @@ stanza_create_caps_query_element(xmpp_ctx_t *ctx)
xmpp_stanza_add_child(query, identity);
xmpp_stanza_release(identity);
GList *features = caps_get_features();
GList *features = caps_get_prof_features();
GList *curr = features;
while (curr) {
xmpp_stanza_t *feature = xmpp_stanza_new(ctx);

4
src/xmpp/xmpp.h
View File

@ -184,8 +184,8 @@ EntityCapabilities* caps_lookup(const char *const jid);
void caps_close(void);
void caps_destroy(EntityCapabilities *caps);
void caps_reset_ver(void);
void caps_add_feature(char *feature);
void caps_remove_feature(char *feature);
void caps_add_prof_feature(char *feature);
void caps_remove_prof_feature(char *feature);
gboolean caps_jid_has_feature(const char *const jid, const char *const feature);
gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str);

4
tests/unittests/xmpp/stub_xmpp.c
View File

@ -204,8 +204,8 @@ void iq_last_activity_request(gchar *jid) {}
void iq_autoping_check(void) {}
// caps functions
void caps_add_feature(char *feature) {}
void caps_remove_feature(char *feature) {}
void caps_add_prof_feature(char *feature) {}
void caps_remove_prof_feature(char *feature) {}
EntityCapabilities* caps_lookup(const char * const jid)
{
return NULL;