[Telepathy-commits] [telepathy-sofiasip/text-fixes] Renamed tpsip_media_session_reject to tpsip_media_session_respond

[Mikhail Zabaluev]

That better reflects what the function does. It does not check if the status
is a final one.
---
 src/sip-media-channel.c |    2 +-
 src/sip-media-session.c |   10 +++++-----
 src/sip-media-session.h |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c
index b03a7da..f80b8e1 100644
--- a/src/sip-media-channel.c
+++ b/src/sip-media-channel.c
@@ -1506,7 +1506,7 @@ tpsip_media_channel_remove_with_reason (GObject *obj,
       status = tpsip_status_from_tp_reason (reason);
 
       /* XXX: raise NotAvailable if it's the wrong state? */
-      tpsip_media_session_reject (priv->session, status, message);
+      tpsip_media_session_respond (priv->session, status, message);
 
       set = tp_intset_new ();
       tp_intset_add (set, handle);
diff --git a/src/sip-media-session.c b/src/sip-media-session.c
index d80c333..084557e 100644
--- a/src/sip-media-session.c
+++ b/src/sip-media-session.c
@@ -1118,17 +1118,17 @@ tpsip_media_session_accept (TpsipMediaSession *self)
 }
 
 void
-tpsip_media_session_reject (TpsipMediaSession *self,
-                          gint status,
-                          const char *message)
+tpsip_media_session_respond (TpsipMediaSession *self,
+                             gint status,
+                             const char *message)
 {
   TpsipMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
 
+  SESSION_DEBUG(self, "responding: %03d %s", status, message? message : "");
+
   if (message != NULL && !message[0])
     message = NULL;
 
-  SESSION_DEBUG(self, "responding: %03d %s", status, message == NULL? "" : message);
-
   if (priv->nua_op)
     nua_respond (priv->nua_op, status, message, TAG_END());
 }
diff --git a/src/sip-media-session.h b/src/sip-media-session.h
index 70d870e..873a4e2 100644
--- a/src/sip-media-session.h
+++ b/src/sip-media-session.h
@@ -93,9 +93,9 @@ gboolean tpsip_media_session_request_stream_direction (TpsipMediaSession *sessio
 void tpsip_media_session_receive_invite (TpsipMediaSession *self);
 void tpsip_media_session_receive_reinvite (TpsipMediaSession *self);
 void tpsip_media_session_accept (TpsipMediaSession *self);
-void tpsip_media_session_reject (TpsipMediaSession *self,
-                                 gint status,
-                                 const char *message);
+void tpsip_media_session_respond (TpsipMediaSession *self,
+                                  gint status,
+                                  const char *message);
 gboolean tpsip_media_session_is_accepted (TpsipMediaSession *self);
 void tpsip_media_session_resolve_glare (TpsipMediaSession *self);
 
-- 
1.5.6.5