Replace the has-dtmf property by empathy_tp_call_has_dtmf() (Alban Crequy)

svn path=/trunk/; revision=1165

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 1f3371eea3305a628ed6040aca01322047cdbfb9..fd3503ca46382dc7c899908567cd0300fe21563c 100644 (file)
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -62,7 +62,6 @@ enum
   PROP_CHANNEL,
   PROP_CONTACT,
   PROP_IS_INCOMING,
-  PROP_HAS_DTMF,
   PROP_STATUS,
   PROP_AUDIO_STREAM,
   PROP_VIDEO_STREAM
@@ -573,10 +572,6 @@ tp_call_get_property (GObject *object,
     case PROP_IS_INCOMING:
       g_value_set_boolean (value, priv->is_incoming);
       break;
-    case PROP_HAS_DTMF:
-      g_value_set_boolean (value, tp_proxy_has_interface_by_id (priv->channel,
-          TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF));
-      break;
     case PROP_STATUS:
       g_value_set_uint (value, priv->status);
       break;
@@ -619,10 +614,6 @@ empathy_tp_call_class_init (EmpathyTpCallClass *klass)
       g_param_spec_boolean ("is-incoming", "Is media stream incoming",
       "Is media stream incoming", FALSE, G_PARAM_READABLE |
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-  g_object_class_install_property (object_class, PROP_HAS_DTMF,
-      g_param_spec_boolean ("has-dtmf", "Has the media channel DTMF",
-      "Has the media channel DTMF", FALSE, G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
   g_object_class_install_property (object_class, PROP_STATUS,
       g_param_spec_uint ("status", "Call status",
       "Call status", 0, 255, 0, G_PARAM_READABLE | G_PARAM_STATIC_NICK |
@@ -851,3 +842,12 @@ empathy_tp_call_stop_tone (EmpathyTpCall *call)
       "stoping tone", NULL, G_OBJECT (call));
 }
 
+gboolean
+empathy_tp_call_has_dtmf (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  return tp_proxy_has_interface_by_id (priv->channel,
+      TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF);
+}
+

diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h
index 644d778fbdcfec4be0c9bb6d45ab7251f531b9ce..5da79fa130a9725b0a45e2fb437dd3cd3f5a8573 100644 (file)
--- a/libempathy/empathy-tp-call.h
+++ b/libempathy/empathy-tp-call.h
@@ -86,6 +86,7 @@ void empathy_tp_call_mute_output (EmpathyTpCall *call, gboolean is_muted);
 void empathy_tp_call_mute_input (EmpathyTpCall *call, gboolean is_muted);
 void empathy_tp_call_start_tone (EmpathyTpCall *call, TpDTMFEvent event);
 void empathy_tp_call_stop_tone (EmpathyTpCall *call);
+gboolean empathy_tp_call_has_dtmf (EmpathyTpCall *call);
 
 G_END_DECLS
 

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 02df753a77f146132722075ea2883e30eafae65e..c5e7e6419b4b4cac208ae31011519376a7d26916 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -340,7 +340,6 @@ call_window_update (EmpathyCallWindow *window)
   EmpathyTpCallStream *audio_stream;
   EmpathyTpCallStream *video_stream;
   gboolean is_incoming;
-  gboolean has_dtmf;
   gchar *title;
 
   g_object_get (window->call,
@@ -349,7 +348,6 @@ call_window_update (EmpathyCallWindow *window)
       "video-stream", &video_stream,
       "contact", &contact,
       "is-incoming", &is_incoming,
-      "has-dtmf", &has_dtmf,
       NULL);
 
   if (video_stream->state > audio_stream->state)
@@ -361,7 +359,7 @@ call_window_update (EmpathyCallWindow *window)
       "is-incoming: %d video-stream direction: %d",
       window->status, stream_state, is_incoming, video_stream->direction);
 
-  if (has_dtmf)
+  if (empathy_tp_call_has_dtmf (window->call))
     {
       gtk_widget_show (window->keypad_expander);
     }