diff options
| author | Davyd Madeley <davyd@madeley.id.au> | 2009-07-15 23:45:12 +0800 |
|---|---|---|
| committer | Davyd Madeley <davyd@madeley.id.au> | 2009-07-15 23:45:12 +0800 |
| commit | aedb2729fa86eafc2891bc522cad68285d41b8a5 (patch) | |
| tree | 43b59bda29aa676f83d8ff136b24f1d127e753f7 /src/empathy-call-window.c | |
| parent | 2a6048e015b83b22eb2c771412b2e4770c4ada01 (diff) | |
| parent | 9fe194288e580fcbd79fcae90050ccb8b6380a63 (diff) | |
| download | gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar.gz gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar.bz2 gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar.lz gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar.xz gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.tar.zst gsoc2013-empathy-aedb2729fa86eafc2891bc522cad68285d41b8a5.zip | |
Merge commit 'jtellier/video-call-button-sensitivity'
Diffstat (limited to 'src/empathy-call-window.c')
| -rw-r--r-- | src/empathy-call-window.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index a71e9c8be..520a92821 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -809,7 +809,6 @@ static void init_contact_avatar_with_size (EmpathyContact *contact, GtkWidget *image_widget, gint size) { - GdkPixbuf *pixbuf_avatar = NULL; if (contact != NULL) @@ -1347,6 +1346,8 @@ empathy_call_window_connected (gpointer user_data) EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); EmpathyTpCall *call; + gboolean can_send_video = priv->video_input != NULL && priv->contact != NULL + && empathy_contact_can_voip_video (priv->contact); g_object_get (priv->handler, "tp-call", &call, NULL); @@ -1357,9 +1358,10 @@ empathy_call_window_connected (gpointer user_data) gtk_widget_set_sensitive (priv->dtmf_panel, TRUE); if (priv->video_input == NULL) - empathy_call_window_set_send_video (self, FALSE); + empathy_call_window_set_send_video (self, FALSE); - priv->sending_video = empathy_tp_call_is_sending_video (call); + priv->sending_video = can_send_video ? + empathy_tp_call_is_sending_video (call) : FALSE; gtk_action_set_sensitive (priv->show_preview, TRUE); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_preview), @@ -1370,8 +1372,8 @@ empathy_call_window_connected (gpointer user_data) gtk_toggle_tool_button_set_active ( GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), priv->sending_video && priv->video_input != NULL); - gtk_widget_set_sensitive (priv->camera_button, priv->video_input != NULL); - gtk_action_set_sensitive (priv->send_video, priv->video_input != NULL); + gtk_widget_set_sensitive (priv->camera_button, can_send_video); + gtk_action_set_sensitive (priv->send_video, can_send_video); gtk_action_set_sensitive (priv->redial, FALSE); gtk_widget_set_sensitive (priv->redial_button, FALSE); |