From c5176014e764530f6e0d682924f7dffc171ce4cf Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 22 Nov 2016 22:21:14 +0000
Subject: [PATCH] Rename self caps functions

---
 src/command/cmd_funcs.c          | 8 ++++----
 src/xmpp/capabilities.c          | 6 +++---
 src/xmpp/capabilities.h          | 2 +-
 src/xmpp/stanza.c                | 2 +-
 src/xmpp/xmpp.h                  | 4 ++--
 tests/unittests/xmpp/stub_xmpp.c | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index eea37459..d0ae3047 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -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);
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index e09270cb..9a9179cd 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -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;
 
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
index 9b77734e..5c05fa94 100644
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -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
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 2c4f1bd0..88313333 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -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);
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 7302b279..733c9e97 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -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);
diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c
index e4ef7ea1..2eef8c51 100644
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -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;