X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-call-window.c;h=eb39855babb9632c1257b1a78a441b33f76c7ead;hp=d9641fdf95e8a7aa062116039976b66a7ebf7a69;hb=f2d81bc778ae11d5518d9b054ce230fc90d37c82;hpb=05649508bf21c519402a049ba5be367430eb58d5 diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index d9641fdf..eb39855b 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -19,57 +19,35 @@ */ #include "config.h" +#include "empathy-call-window.h" -#include -#include - -#include - -#include -#include -#include #include - -#include -#include -#include - -#include #include -#include - #include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include - -#include "empathy-call-window.h" -#include "empathy-call-window-fullscreen.h" -#include "empathy-call-factory.h" #include "empathy-about-dialog.h" -#include "empathy-audio-src.h" #include "empathy-audio-sink.h" -#include "empathy-video-src.h" +#include "empathy-call-utils.h" +#include "empathy-call-window-fullscreen.h" +#include "empathy-camera-menu.h" +#include "empathy-camera-monitor.h" +#include "empathy-dialpad-widget.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" #include "empathy-mic-menu.h" #include "empathy-preferences.h" +#include "empathy-request-util.h" #include "empathy-rounded-actor.h" #include "empathy-rounded-rectangle.h" #include "empathy-rounded-texture.h" -#include "empathy-camera-menu.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include "empathy-debug.h" #define CONTENT_HBOX_SPACING 3 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0 @@ -83,9 +61,6 @@ #define SELF_VIDEO_SECTION_MARGIN 2 #define SELF_VIDEO_SECTION_BORDER SELF_VIDEO_SECTION_MARGIN*2 -#define FLOATING_TOOLBAR_OPACITY 192 -#define FLOATING_TOOLBAR_SPACING 20 - /* The avatar's default width and height are set to the same value because we want a square icon. */ #define REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT REMOTE_VIDEO_DEFAULT_HEIGHT @@ -102,12 +77,21 @@ /* The roundedness of preview box and placeholders */ #define PREVIEW_ROUND_FACTOR 16 +#define PREVIEW_BUTTON_OPACITY 180 + G_DEFINE_TYPE(EmpathyCallWindow, empathy_call_window, GTK_TYPE_WINDOW) enum { PROP_CALL_HANDLER = 1, }; +enum { + SIG_INHIBIT, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + typedef enum { RINGING, /* Incoming call */ CONNECTING, /* Outgoing call */ @@ -139,7 +123,7 @@ struct _EmpathyCallWindowPriv EmpathyCameraMonitor *camera_monitor; - guint call_state; + CallState call_state; gboolean outgoing; GtkUIManager *ui_manager; @@ -167,6 +151,7 @@ struct _EmpathyCallWindowPriv GtkWidget *audio_call_button; GtkWidget *video_call_button; GtkWidget *mic_button; + GtkWidget *microphone_icon; GtkWidget *volume_button; GtkWidget *camera_button; GtkWidget *dialpad_button; @@ -476,6 +461,17 @@ audio_input_mute_notify_cb (GObject *obj, GParamSpec *spec, if (muted && self->priv->transitions) clutter_state_set_state (self->priv->transitions, "fade-in"); + if (muted) + { + gtk_image_set_from_icon_name (GTK_IMAGE (self->priv->microphone_icon), + EMPATHY_IMAGE_MIC_MUTED, GTK_ICON_SIZE_MENU); + } + else + { + gtk_image_set_from_icon_name (GTK_IMAGE (self->priv->microphone_icon), + EMPATHY_IMAGE_MIC, GTK_ICON_SIZE_MENU); + } + empathy_call_window_update_timer (self); } @@ -490,12 +486,6 @@ create_audio_input (EmpathyCallWindow *self) g_signal_connect (priv->audio_input, "notify::mute", G_CALLBACK (audio_input_mute_notify_cb), self); - - g_object_bind_property (priv->mic_button, "active", - priv->audio_input, "mute", - G_BINDING_BIDIRECTIONAL | - G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE); - } static void @@ -542,8 +532,8 @@ empathy_call_window_disable_camera_cb (GtkAction *action, { clutter_actor_destroy (self->priv->preview_hidden_button); - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (self->priv->camera_button), FALSE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (self->priv->camera_button), FALSE); } static void @@ -624,7 +614,8 @@ empathy_call_window_camera_removed_cb (EmpathyCameraMonitor *monitor, } static void -empathy_call_window_preview_button_clicked_cb (GtkButton *button, +empathy_call_window_preview_button_clicked_cb (ClutterClickAction *action, + ClutterActor *actor, EmpathyCallWindow *self) { GtkWidget *menu; @@ -637,7 +628,9 @@ empathy_call_window_preview_button_clicked_cb (GtkButton *button, } static void -empathy_call_window_preview_hidden_button_clicked_cb (GtkButton *button, +empathy_call_window_preview_hidden_button_clicked_cb ( + ClutterClickAction *action, + ClutterActor *actor, EmpathyCallWindow *self) { GtkWidget *menu; @@ -1065,7 +1058,6 @@ create_video_preview (EmpathyCallWindow *self) ClutterActor *preview; ClutterActor *b; ClutterAction *action; - GtkWidget *button; PreviewPosition pos; g_assert (priv->video_preview == NULL); @@ -1117,27 +1109,27 @@ create_video_preview (EmpathyCallWindow *self) "async", FALSE, NULL); - /* Translators: this is an "Info" label. It should be as short - * as possible. */ - button = gtk_button_new_with_label (_("i")); - priv->preview_shown_button = b = gtk_clutter_actor_new_with_contents (button); - clutter_actor_set_size (b, 24, 24); + /* Preview show */ + priv->preview_shown_button = b = gtk_clutter_actor_new_with_contents ( + gtk_image_new_from_icon_name ("emblem-system-symbolic", + GTK_ICON_SIZE_MENU)); clutter_actor_set_margin_right (b, 4); clutter_actor_set_margin_bottom (b, 2); + clutter_actor_set_opacity (b, PREVIEW_BUTTON_OPACITY); make_background_transparent (GTK_CLUTTER_ACTOR (b)); clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (layout), b, CLUTTER_BIN_ALIGNMENT_END, CLUTTER_BIN_ALIGNMENT_END); - g_signal_connect (button, "clicked", - G_CALLBACK (empathy_call_window_preview_button_clicked_cb), - self); + action = clutter_click_action_new (); + clutter_actor_add_action (b, action); + g_signal_connect (action, "clicked", + G_CALLBACK (empathy_call_window_preview_button_clicked_cb), self); - /* Translators: this is an "Info" label. It should be as short - * as possible. */ - button = gtk_button_new_with_label (_("i")); - priv->preview_hidden_button = b = gtk_clutter_actor_new_with_contents (button); - clutter_actor_set_size (b, 24, 24); + /* Preview hidden */ + priv->preview_hidden_button = b = gtk_clutter_actor_new_with_contents ( + gtk_image_new_from_icon_name ("emblem-system-symbolic", + GTK_ICON_SIZE_MENU)); make_background_transparent (GTK_CLUTTER_ACTOR (b)); clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->preview_layout), @@ -1149,9 +1141,10 @@ create_video_preview (EmpathyCallWindow *self) clutter_actor_hide (priv->preview_hidden_button); - g_signal_connect (button, "clicked", - G_CALLBACK (empathy_call_window_preview_hidden_button_clicked_cb), - self); + action = clutter_click_action_new (); + clutter_actor_add_action (b, action); + g_signal_connect (action, "clicked", + G_CALLBACK (empathy_call_window_preview_hidden_button_clicked_cb), self); clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->preview_layout), priv->video_preview, @@ -1310,10 +1303,10 @@ enable_camera (EmpathyCallWindow *self) } static void -empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle, +empathy_call_window_camera_toggled_cb (GtkToggleButton *toggle, EmpathyCallWindow *self) { - if (gtk_toggle_tool_button_get_active (toggle)) + if (gtk_toggle_button_get_active (toggle)) enable_camera (self); else disable_camera (self); @@ -1362,7 +1355,65 @@ empathy_call_window_contents_cb (GtkAction *action, } static void -empathy_call_window_debug_cb (GtkAction *action, +show_png (GPid pid, gint status, gpointer user_data) +{ + gtk_show_uri (NULL, (gchar *) user_data, GDK_CURRENT_TIME, NULL); + g_spawn_close_pid (pid); + g_free (user_data); +} + +static void +empathy_call_window_debug_gst_cb (GtkAction *action, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + GDateTime *date_time; + GPid dot_pid; + const gchar *dot_dir; + const gchar *prgname; + gchar *dot_cmd; + gchar *filename; + gchar **argv; + gint argc; + + if (priv->pipeline == NULL) + DEBUG ("No pipeline"); + + date_time = g_date_time_new_now_utc (); + prgname = g_get_prgname (); + filename = g_strdup_printf ("%s-%" G_GINT64_FORMAT, prgname, + g_date_time_to_unix (date_time)); + + GST_DEBUG_BIN_TO_DOT_FILE (GST_BIN (priv->pipeline), + GST_DEBUG_GRAPH_SHOW_ALL, filename); + + dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR"); + dot_cmd = g_strdup_printf ("dot -Tpng -o %s.png %s.dot", + filename, + filename); + g_shell_parse_argv (dot_cmd, &argc, &argv, NULL); + + if (g_spawn_async (dot_dir, + argv, + NULL, + G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, + NULL, + NULL, + &dot_pid, + NULL)) + { + gchar *uri = g_strdup_printf ("file://%s/%s.png", dot_dir, filename); + g_child_watch_add (dot_pid, show_png, uri); + } + + g_strfreev (argv); + g_free (dot_cmd); + g_free (filename); + g_date_time_unref (date_time); +} + +static void +empathy_call_window_debug_tp_cb (GtkAction *action, EmpathyCallWindow *self) { empathy_launch_program (BIN_DIR, "empathy-debugger", "-s Empathy.Call"); @@ -1541,6 +1592,16 @@ empathy_call_window_start_ringing (EmpathyCallWindow *self, tp_add_dispatch_operation_context_accept (context); } +static void +mic_button_clicked (GtkWidget *button, + EmpathyCallWindow *self) +{ + /* Toggle the muted state. We rely on audio_input_mute_notify_cb to update + * the icon. */ + empathy_audio_src_set_mute (EMPATHY_GST_AUDIO_SRC (self->priv->audio_input), + !self->priv->muted); +} + static void empathy_call_window_init (EmpathyCallWindow *self) { @@ -1550,7 +1611,6 @@ empathy_call_window_init (EmpathyCallWindow *self) gchar *filename; ClutterConstraint *constraint; ClutterActor *remote_avatar; - GtkCssProvider *provider; ClutterColor black = { 0, 0, 0, 0 }; ClutterMargin overlay_margin = { OVERLAY_MARGIN, OVERLAY_MARGIN, OVERLAY_MARGIN, OVERLAY_MARGIN }; @@ -1573,6 +1633,7 @@ empathy_call_window_init (EmpathyCallWindow *self) "audiocall", &priv->audio_call_button, "videocall", &priv->video_call_button, "microphone", &priv->mic_button, + "microphone_icon", &priv->microphone_icon, "volume", &priv->volume_button, "camera", &priv->camera_button, "hangup", &priv->hangup_button, @@ -1607,7 +1668,8 @@ empathy_call_window_init (EmpathyCallWindow *self) "menufullscreen", "activate", empathy_call_window_fullscreen_cb, "menusettings", "activate", empathy_call_window_settings_cb, "menucontents", "activate", empathy_call_window_contents_cb, - "menudebug", "activate", empathy_call_window_debug_cb, + "menudebuggst", "activate", empathy_call_window_debug_gst_cb, + "menudebugtp", "activate", empathy_call_window_debug_tp_cb, "menuabout", "activate", empathy_call_window_about_cb, "menupreviewdisable", "activate", empathy_call_window_disable_camera_cb, "menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb, @@ -1615,17 +1677,7 @@ empathy_call_window_init (EmpathyCallWindow *self) "menupreviewswap", "activate", empathy_call_window_swap_camera_cb, NULL); - /* FIXME: we should use a stock "OSD" style class for the toolbar, - * once it's available in GTK+/Adwaita. - */ - provider = gtk_css_provider_new (); - gtk_css_provider_load_from_data (provider, - "#CallFloatingToolbar { border-radius: 6px; }", -1, NULL); - gtk_style_context_add_provider ( - gtk_widget_get_style_context (priv->bottom_toolbar), - GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - g_object_unref (provider); - + empathy_set_css_provider (GTK_WIDGET (self)); gtk_action_set_sensitive (priv->menu_fullscreen, FALSE); priv->camera_monitor = empathy_camera_monitor_dup_singleton (); @@ -1639,6 +1691,9 @@ empathy_call_window_init (EmpathyCallWindow *self) g_signal_connect (priv->camera_monitor, "removed", G_CALLBACK (empathy_call_window_camera_removed_cb), self); + g_signal_connect (priv->mic_button, "clicked", + G_CALLBACK (mic_button_clicked), self); + g_mutex_init (&priv->lock); gtk_container_add (GTK_CONTAINER (self), top_vbox); @@ -1711,6 +1766,9 @@ empathy_call_window_init (EmpathyCallWindow *self) clutter_actor_set_reactive (priv->floating_toolbar, TRUE); make_background_transparent (GTK_CLUTTER_ACTOR (priv->floating_toolbar)); + gtk_style_context_add_class ( + gtk_widget_get_style_context (GTK_WIDGET (priv->bottom_toolbar)), + GTK_STYLE_CLASS_OSD); gtk_widget_reparent (priv->bottom_toolbar, gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (priv->floating_toolbar))); @@ -1718,8 +1776,6 @@ empathy_call_window_init (EmpathyCallWindow *self) priv->floating_toolbar, CLUTTER_BIN_ALIGNMENT_CENTER, CLUTTER_BIN_ALIGNMENT_END); - clutter_actor_set_opacity (priv->floating_toolbar, FLOATING_TOOLBAR_OPACITY); - clutter_actor_raise_top (priv->floating_toolbar); /* Transitions for the floating toolbar */ @@ -1737,7 +1793,7 @@ empathy_call_window_init (EmpathyCallWindow *self) /* transition from any state to "fade-in" state */ clutter_state_set (priv->transitions, NULL, "fade-in", priv->floating_toolbar, - "opacity", CLUTTER_EASE_OUT_QUAD, FLOATING_TOOLBAR_OPACITY, + "opacity", CLUTTER_EASE_OUT_QUAD, 255, NULL); /* put the actor into the "fade-in" state with no animation */ @@ -1800,6 +1856,8 @@ empathy_call_window_init (EmpathyCallWindow *self) empathy_call_window_show_hangup_button (self, TRUE); + gtk_window_set_default_size (GTK_WINDOW (self), 580, 480); + empathy_geometry_bind (GTK_WINDOW (self), "call-window"); /* These signals are used to track the window position and save it * when the window is destroyed. We need to do this as we don't want @@ -2208,8 +2266,8 @@ empathy_call_window_constructed (GObject *object) if (!empathy_call_handler_has_initial_video (priv->handler)) { - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), FALSE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (priv->camera_button), FALSE); } /* If call has InitialVideo, the preview will be started once the call has * been started (start_call()). */ @@ -2290,6 +2348,13 @@ empathy_call_window_class_init ( G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_CALL_HANDLER, param_spec); + + signals[SIG_INHIBIT] = g_signal_new ("inhibit", + G_OBJECT_CLASS_TYPE (empathy_call_window_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, + 1, G_TYPE_BOOLEAN); } void @@ -2440,6 +2505,9 @@ empathy_call_window_conference_removed_cb (EmpathyCallHandler *handler, EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); + g_list_free_full (priv->notifiers, g_object_unref); + priv->notifiers = NULL; + gst_bin_remove (GST_BIN (priv->pipeline), conference); gst_element_set_state (conference, GST_STATE_NULL); } @@ -2530,9 +2598,18 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, /* Leave full screen mode if needed */ gtk_window_unfullscreen (GTK_WINDOW (self)); + g_signal_emit (self, signals[SIG_INHIBIT], 0, FALSE); + gtk_action_set_sensitive (priv->menu_fullscreen, FALSE); gtk_widget_set_sensitive (priv->dtmf_panel, FALSE); + /* Create the video input and then turn on the camera + * menu, so that the active camera gets marked as such. + */ + if (priv->video_input == NULL) + create_video_input (self); + empathy_camera_menu_set_sensitive (priv->camera_menu, TRUE); + could_reset_pipeline = empathy_call_window_reset_pipeline (self); if (priv->call_state == CONNECTING) @@ -2570,8 +2647,8 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, gtk_widget_set_sensitive (priv->mic_button, FALSE); /* Be sure that the mic button is enabled */ - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->mic_button), TRUE); + empathy_audio_src_set_mute ( + EMPATHY_GST_AUDIO_SRC (self->priv->audio_input), FALSE); if (priv->camera_state == CAMERA_STATE_ON) { @@ -2728,12 +2805,15 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self) if (priv->funnel == NULL) { output = priv->video_output_sink; - +#ifdef HAVE_GST1 + priv->funnel = gst_element_factory_make ("funnel", NULL); +#else priv->funnel = gst_element_factory_make ("fsfunnel", NULL); +#endif if (!priv->funnel) { - g_warning ("Could not create fsfunnel"); + g_warning ("Could not create video funnel"); return NULL; } @@ -2769,8 +2849,11 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self) goto error_output_added; } } - +#ifdef HAVE_GST1 + pad = gst_element_get_request_pad (priv->funnel, "sink_%u"); +#else pad = gst_element_get_request_pad (priv->funnel, "sink%d"); +#endif if (!pad) g_warning ("Could not get request pad from funnel"); @@ -2820,6 +2903,7 @@ empathy_call_window_get_audio_sink_pad (EmpathyCallWindow *self, g_warning ("Could not start audio sink"); goto error; } + priv->audio_output_added = TRUE; } template = gst_element_class_get_pad_template ( @@ -2860,8 +2944,9 @@ empathy_call_window_update_timer (gpointer user_data) if (priv->call_state == HELD) status = _("On hold"); - else if (!gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->mic_button))) + else if (priv->call_state == DISCONNECTED) + status = _("Disconnected"); + else if (priv->muted) status = _("Mute"); else status = _("Duration"); @@ -3031,7 +3116,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self, case TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR: tp_connection_parse_object_path ( - tp_channel_borrow_connection (TP_CHANNEL (call)), + tp_channel_get_connection (TP_CHANNEL (call)), NULL, &cm); url = g_strdup_printf ("http://bugs.freedesktop.org/enter_bug.cgi?" @@ -3118,7 +3203,7 @@ show_balance_error (EmpathyCallWindow *self) "call-channel", &call, NULL); - conn = tp_channel_borrow_connection (call); + conn = tp_channel_get_connection (call); g_object_unref (call); uri = tp_connection_get_balance_uri (conn); @@ -3249,6 +3334,27 @@ empathy_call_window_check_video_cb (gpointer data) } /* Called from the streaming thread */ +#ifdef HAVE_GST1 +static GstPadProbeReturn +empathy_call_window_video_probe_cb (GstPad *pad, + GstPadProbeInfo *info, + gpointer user_data) +{ + EmpathyCallWindow *self = user_data; + + if (G_UNLIKELY (!self->priv->got_video)) + { + /* show the remote video */ + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + empathy_call_window_show_video_output_cb, + g_object_ref (self), g_object_unref); + + self->priv->got_video = TRUE; + } + + return GST_PAD_PROBE_OK; +} +#else static gboolean empathy_call_window_video_probe_cb (GstPad *pad, GstMiniObject *mini_obj, @@ -3270,6 +3376,7 @@ empathy_call_window_video_probe_cb (GstPad *pad, return TRUE; } +#endif /* Called from the streaming thread */ static gboolean @@ -3296,8 +3403,14 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, g_idle_add (empathy_call_window_show_video_output_cb, self); pad = empathy_call_window_get_video_sink_pad (self); +#ifdef HAVE_GST1 + gst_pad_add_probe (src, + GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST, + empathy_call_window_video_probe_cb, self, NULL); +#else gst_pad_add_data_probe (src, G_CALLBACK (empathy_call_window_video_probe_cb), self); +#endif if (priv->got_video_src > 0) g_source_remove (priv->got_video_src); priv->got_video_src = g_timeout_add_seconds (1, @@ -3476,7 +3589,11 @@ empathy_call_window_content_added_cb (EmpathyCallHandler *handler, case FS_MEDIA_TYPE_VIDEO: if (priv->video_tee != NULL) { +#ifdef HAVE_GST1 + pad = gst_element_get_request_pad (priv->video_tee, "src_%u"); +#else pad = gst_element_get_request_pad (priv->video_tee, "src%d"); +#endif if (GST_PAD_LINK_FAILED (gst_pad_link (pad, sink))) { g_warning ("Could not link video source input pipeline"); @@ -3521,6 +3638,7 @@ empathy_call_window_remove_video_input (EmpathyCallWindow *self) priv->video_preview = NULL; gtk_widget_set_sensitive (priv->camera_button, FALSE); + empathy_camera_menu_set_sensitive (priv->camera_menu, FALSE); } static void @@ -3528,6 +3646,8 @@ start_call (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); + g_signal_emit (self, signals[SIG_INHIBIT], 0, TRUE); + priv->call_started = TRUE; empathy_call_handler_start_call (priv->handler, gtk_get_current_event_time ()); @@ -3550,13 +3670,13 @@ start_call (EmpathyCallWindow *self) s == TP_SENDING_STATE_SENDING) { /* Enable 'send video' buttons and display the preview */ - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), TRUE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (priv->camera_button), TRUE); } else { - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), FALSE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (priv->camera_button), FALSE); if (priv->video_preview == NULL) { @@ -3895,7 +4015,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget, show_controls (window, set_fullscreen); show_borders (window, set_fullscreen); gtk_action_set_stock_id (priv->menu_fullscreen, - (set_fullscreen ? "gtk-leave-fullscreen" : "gtk-fullscreen")); + (set_fullscreen ? "view-restore" : "view-fullscreen")); priv->is_fullscreen = set_fullscreen; } @@ -4041,6 +4161,7 @@ empathy_call_window_key_press_cb (GtkWidget *video_output, GdkEventKey *event, EmpathyCallWindow *window) { EmpathyCallWindowPriv *priv = GET_PRIV (window); + gchar key; if (priv->is_fullscreen && event->keyval == GDK_KEY_Escape) { @@ -4050,7 +4171,34 @@ empathy_call_window_key_press_cb (GtkWidget *video_output, return TRUE; } - return FALSE; + key = gdk_keyval_to_unicode (event->keyval); + switch (key) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '*': + case '#': + break; + default: + return TRUE; + break; + } + + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (priv->dialpad_button), TRUE); + + empathy_dialpad_widget_press_key ( + EMPATHY_DIALPAD_WIDGET (priv->dtmf_panel), key); + + return TRUE; } static gboolean