* Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-call-factory.h>
-#include <libempathy/empathy-dispatcher.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-camera-monitor.h"
+#include "libempathy/empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-images.h"
#include "empathy-new-call-dialog.h"
-#include "empathy-account-chooser.h"
+#include "empathy-call-utils.h"
static EmpathyNewCallDialog *dialog_singleton = NULL;
G_DEFINE_TYPE(EmpathyNewCallDialog, empathy_new_call_dialog,
- EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG)
-
-typedef struct _EmpathyNewCallDialogPriv EmpathyNewCallDialogPriv;
+ GTK_TYPE_DIALOG)
struct _EmpathyNewCallDialogPriv {
- GtkWidget *check_video;
+ GtkWidget *chooser;
+ GtkWidget *button_audio;
+ GtkWidget *button_video;
+
+ EmpathyCameraMonitor *monitor;
};
-#define GET_PRIV(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), EMPATHY_TYPE_NEW_CALL_DIALOG, \
- EmpathyNewCallDialogPriv))
+/* Re-use the accept and ok Gtk response so we are sure they won't be used
+ * when the dialog window is closed for example */
+enum
+{
+ RESPONSE_AUDIO = GTK_RESPONSE_ACCEPT,
+ RESPONSE_VIDEO = GTK_RESPONSE_OK,
+};
/**
* SECTION:empathy-new-call-dialog
*/
static void
-got_contact_cb (EmpathyTpContactFactory *factory,
- EmpathyContact *contact,
- const GError *error,
- gpointer user_data,
- GObject *object)
+empathy_new_call_dialog_response (GtkDialog *dialog,
+ int response_id)
{
- EmpathyCallFactory *call_factory;
- gboolean video = GPOINTER_TO_UINT (user_data);
+ EmpathyNewCallDialog *self = (EmpathyNewCallDialog *) dialog;
+ FolksIndividual *individual;
+ EmpathyContact *contact;
- if (error != NULL)
- {
- DEBUG ("Failed: %s", error->message);
- return;
- }
+ if (response_id != RESPONSE_AUDIO &&
+ response_id != RESPONSE_VIDEO)
+ goto out;
+
+ individual = empathy_contact_chooser_dup_selected (
+ EMPATHY_CONTACT_CHOOSER (self->priv->chooser));
+ if (individual == NULL) goto out;
+
+ empathy_individual_can_audio_video_call (individual, NULL, NULL, &contact);
+ g_assert (contact != NULL);
+
+ empathy_call_new_with_streams (empathy_contact_get_id (contact),
+ empathy_contact_get_account (contact), TRUE,
+ response_id == RESPONSE_VIDEO, empathy_get_current_action_time ());
+
+ g_object_unref (individual);
+ g_object_unref (contact);
- call_factory = empathy_call_factory_get ();
- empathy_call_factory_new_call_with_streams (call_factory, contact, TRUE,
- video);
+out:
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
static void
-empathy_new_call_dialog_got_response (EmpathyContactSelectorDialog *dialog,
- TpConnection *connection,
- const gchar *contact_id)
+empathy_new_call_dialog_dispose (GObject *object)
{
- EmpathyNewCallDialogPriv *priv = GET_PRIV (dialog);
- EmpathyTpContactFactory *factory;
- gboolean video;
+ EmpathyNewCallDialog *self = (EmpathyNewCallDialog *) object;
- /* check if video is enabled now because the dialog will be destroyed once
- * we return from this function. */
- video = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->check_video));
+ tp_clear_object (&self->priv->monitor);
- factory = empathy_tp_contact_factory_dup_singleton (connection);
- empathy_tp_contact_factory_get_from_id (factory, contact_id,
- got_contact_cb, GUINT_TO_POINTER (video), NULL, NULL);
-
- g_object_unref (factory);
+ G_OBJECT_CLASS (empathy_new_call_dialog_parent_class)->dispose (object);
}
static GObject *
return retval;
}
+static gboolean
+filter_individual (EmpathyContactChooser *chooser,
+ FolksIndividual *individual,
+ gboolean is_online,
+ gboolean searching,
+ gpointer user_data)
+{
+ gboolean can_audio_call, can_video_call;
+
+ empathy_individual_can_audio_video_call (individual, &can_audio_call,
+ &can_video_call, NULL);
+
+ return can_audio_call || can_video_call;
+}
+
+static void
+selection_changed_cb (GtkWidget *chooser,
+ FolksIndividual *selected,
+ EmpathyNewCallDialog *self)
+{
+ gboolean can_audio_call, can_video_call;
+
+ if (selected == NULL)
+ {
+ can_audio_call = can_video_call = FALSE;
+ }
+ else
+ {
+ empathy_individual_can_audio_video_call (selected, &can_audio_call,
+ &can_video_call, NULL);
+ }
+
+ gtk_widget_set_sensitive (self->priv->button_audio, can_audio_call);
+ gtk_widget_set_sensitive (self->priv->button_video, can_video_call);
+}
+
+static void
+selection_activate_cb (GtkWidget *chooser,
+ EmpathyNewCallDialog *self)
+{
+ gtk_dialog_response (GTK_DIALOG (self), RESPONSE_AUDIO);
+}
+
static void
-empathy_new_call_dialog_init (EmpathyNewCallDialog *dialog)
+empathy_new_call_dialog_init (EmpathyNewCallDialog *self)
{
- EmpathyContactSelectorDialog *parent = EMPATHY_CONTACT_SELECTOR_DIALOG (
- dialog);
- EmpathyNewCallDialogPriv *priv = GET_PRIV (dialog);
+ GtkWidget *label;
GtkWidget *image;
+ GtkWidget *content;
- /* add video toggle */
- priv->check_video = gtk_check_button_new_with_mnemonic (_("Send _Video"));
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_NEW_CALL_DIALOG, EmpathyNewCallDialogPriv);
- gtk_table_attach_defaults (GTK_TABLE (parent->table_contact),
- priv->check_video, 1, 2, 2, 3);
+ self->priv->monitor = empathy_camera_monitor_dup_singleton ();
- gtk_widget_show (priv->check_video);
+ content = gtk_dialog_get_content_area (GTK_DIALOG (self));
- /* add chat button */
- parent->button_action = gtk_button_new_with_mnemonic (_("_Call"));
+ label = gtk_label_new (_("Enter a contact identifier or phone number:"));
+ gtk_box_pack_start (GTK_BOX (content), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ /* contact chooser */
+ self->priv->chooser = empathy_contact_chooser_new ();
+
+ empathy_contact_chooser_set_filter_func (
+ EMPATHY_CONTACT_CHOOSER (self->priv->chooser), filter_individual, self);
+
+ gtk_box_pack_start (GTK_BOX (content), self->priv->chooser, TRUE, TRUE, 6);
+ gtk_widget_show (self->priv->chooser);
+
+ g_signal_connect (self->priv->chooser, "selection-changed",
+ G_CALLBACK (selection_changed_cb), self);
+ g_signal_connect (self->priv->chooser, "activate",
+ G_CALLBACK (selection_activate_cb), self);
+
+ /* close button */
+ gtk_dialog_add_button (GTK_DIALOG (self),
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+
+ /* add video button */
+ self->priv->button_video = gtk_button_new_with_mnemonic (_("_Video Call"));
+ image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL,
+ GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (self->priv->button_video), image);
+
+ gtk_dialog_add_action_widget (GTK_DIALOG (self), self->priv->button_video,
+ RESPONSE_VIDEO);
+ gtk_widget_show (self->priv->button_video);
+
+ /* add audio button */
+ self->priv->button_audio = gtk_button_new_with_mnemonic (_("_Audio Call"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP,
GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (parent->button_action), image);
+ gtk_button_set_image (GTK_BUTTON (self->priv->button_audio), image);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), parent->button_action,
- GTK_RESPONSE_ACCEPT);
- gtk_widget_show (parent->button_action);
+ gtk_dialog_add_action_widget (GTK_DIALOG (self), self->priv->button_audio,
+ RESPONSE_AUDIO);
+ gtk_widget_show (self->priv->button_audio);
/* Tweak the dialog */
- gtk_window_set_title (GTK_WINDOW (dialog), _("New Call"));
- gtk_window_set_role (GTK_WINDOW (dialog), "new_call");
+ gtk_window_set_title (GTK_WINDOW (self), _("New Call"));
+ gtk_window_set_role (GTK_WINDOW (self), "new_call");
+
+ /* Set a default height so a few contacts are displayed */
+ gtk_window_set_default_size (GTK_WINDOW (self), -1, 400);
- gtk_widget_set_sensitive (parent->button_action, FALSE);
+ gtk_widget_set_sensitive (self->priv->button_audio, FALSE);
+ gtk_widget_set_sensitive (self->priv->button_video, FALSE);
}
static void
EmpathyNewCallDialogClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- EmpathyContactSelectorDialogClass *dialog_class = \
- EMPATHY_CONTACT_SELECTOR_DIALOG_CLASS (class);
+ GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (class);
g_type_class_add_private (class, sizeof (EmpathyNewCallDialogPriv));
object_class->constructor = empathy_new_call_dialog_constructor;
+ object_class->dispose = empathy_new_call_dialog_dispose;
- dialog_class->got_response = empathy_new_call_dialog_got_response;
+ dialog_class->response = empathy_new_call_dialog_response;
}
/**