[telepathy-gabble/master] Renumber JingleRtpRemoteState to be flags.

[Will Thompson]

---
 src/jingle-media-rtp.c |    2 +-
 src/jingle-media-rtp.h |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 8e508e7..c7acbf3 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -253,7 +253,7 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
   param_spec = g_param_spec_uint ("remote-state", "Remote state",
       "Whether the peer is muted, has us on hold, is ringing, or is active on "
       "this content",
-      JINGLE_RTP_REMOTE_STATE_ACTIVE, JINGLE_RTP_REMOTE_STATE_HOLD,
+      JINGLE_RTP_REMOTE_STATE_ACTIVE, JINGLE_RTP_REMOTE_STATE_ALL_FLAGS,
       JINGLE_RTP_REMOTE_STATE_ACTIVE,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_REMOTE_STATE, param_spec);
diff --git a/src/jingle-media-rtp.h b/src/jingle-media-rtp.h
index 0c21c22..eb0b727 100644
--- a/src/jingle-media-rtp.h
+++ b/src/jingle-media-rtp.h
@@ -30,11 +30,15 @@ G_BEGIN_DECLS
 
 typedef enum {
     JINGLE_RTP_REMOTE_STATE_ACTIVE = 0,
-    JINGLE_RTP_REMOTE_STATE_RINGING,
-    JINGLE_RTP_REMOTE_STATE_MUTE,
-    JINGLE_RTP_REMOTE_STATE_HOLD,
+    JINGLE_RTP_REMOTE_STATE_RINGING = 1 << 0,
+    JINGLE_RTP_REMOTE_STATE_MUTE = 1 << 1,
+    JINGLE_RTP_REMOTE_STATE_HOLD = 1 << 2,
 } JingleRtpRemoteState;
 
+#define JINGLE_RTP_REMOTE_STATE_ALL_FLAGS \
+    ( JINGLE_RTP_REMOTE_STATE_RINGING | JINGLE_RTP_REMOTE_STATE_MUTE \
+    | JINGLE_RTP_REMOTE_STATE_HOLD )
+
 typedef struct _GabbleJingleMediaRtpClass GabbleJingleMediaRtpClass;
 
 GType gabble_jingle_media_rtp_get_type (void);
-- 
1.5.6.5