summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-14 13:35:48 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-14 13:36:09 +0100
commit04c1f9e3f14b4c9c3e1c70547b767b92114c23fe (patch)
tree9d160c172016b5a43225b4813b324847b3eb1298
parentea98af03b19d1cd9366e381f5c3c2c7a1f6d59b0 (diff)
caps-manager: move the feature prefix to the utils header
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--salut/caps-manager.c5
-rw-r--r--salut/utils.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/salut/caps-manager.c b/salut/caps-manager.c
index 8e587e4..44b2e6c 100644
--- a/salut/caps-manager.c
+++ b/salut/caps-manager.c
@@ -28,10 +28,11 @@
#include <salut/caps-channel-manager.h>
+#include "utils.h"
+
#define DEBUG(msg, ...) \
g_debug ("%s: " msg, G_STRFUNC, ##__VA_ARGS__)
-#define FEATURE_PREFIX "urn:ytstenut:capabilities:"
#define INTERESTED "com.meego.xpmn.ytstenut.Channel/interested/"
static void channel_manager_iface_init (gpointer g_iface, gpointer data);
@@ -71,7 +72,7 @@ ytst_caps_manager_represent_client (GabbleCapsChannelManager *manager,
cap = *t + strlen (INTERESTED);
- feature = g_strdup_printf ("%s%s+notify", FEATURE_PREFIX, cap);
+ feature = g_strdup_printf ("%s%s+notify", CAPS_FEATURE_PREFIX, cap);
gabble_capability_set_add (cap_set, feature);
diff --git a/salut/utils.h b/salut/utils.h
index bcab939..3590e2d 100644
--- a/salut/utils.h
+++ b/salut/utils.h
@@ -42,6 +42,8 @@ typedef enum {
YTST_MESSAGE_ERROR_ITEM_NOT_FOUND,
} YtstMessageError;
+#define CAPS_FEATURE_PREFIX "urn:ytstenut:capabilities:"
+
gint ytst_message_error_type_to_wocky (guint ytstenut_type);
guint ytst_message_error_type_from_wocky (gint wocky_type);