#include <libempathy/empathy-log-manager.h>
#include <libempathy/empathy-contact-list.h>
#include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-dispatcher.h>
#include "empathy-chat.h"
#include "empathy-conf.h"
}
static void
-chat_connection_changed_cb (EmpathyAccountManager *manager,
- McAccount *account,
- TpConnectionStatusReason reason,
- TpConnectionStatus current,
- TpConnectionStatus previous,
- EmpathyChat *chat)
+chat_connect_channel_reconnected (EmpathyDispatchOperation *dispatch,
+ const GError *error,
+ gpointer user_data)
{
- EmpathyChatPriv *priv = GET_PRIV (chat);
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyTpChat *tpchat;
+
+ if (error != NULL) {
+ empathy_chat_view_append_event (chat->view,
+ _("Failed to reconnect this chat"));
+ return;
+ }
+
+ tpchat = EMPATHY_TP_CHAT (
+ empathy_dispatch_operation_get_channel_wrapper (dispatch));
+
+ if (empathy_dispatch_operation_claim (dispatch)) {
+ empathy_chat_set_tp_chat (chat, tpchat);
+ }
+}
- if (current == TP_CONNECTION_STATUS_CONNECTED && !priv->tp_chat &&
- empathy_account_equal (account, priv->account) &&
- priv->handle_type != TP_HANDLE_TYPE_NONE) {
- TpConnection *connection;
- MissionControl *mc;
+static void
+chat_new_connection_cb (EmpathyAccountManager *manager,
+ TpConnection *connection,
+ EmpathyChat *chat)
+{
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ McAccount *account;
+ account = empathy_account_manager_get_account (manager, connection);
+ if (!priv->tp_chat && empathy_account_equal (account, priv->account) &&
+ priv->handle_type != TP_HANDLE_TYPE_NONE &&
+ !EMP_STR_EMPTY (priv->id)) {
+
DEBUG ("Account reconnected, request a new Text channel");
- mc = empathy_mission_control_new ();
- connection = mission_control_get_tpconnection (mc, account, NULL);
- tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
- empathy_connection_request_channel (connection, -1,
- TP_IFACE_CHANNEL_TYPE_TEXT,
- priv->handle_type,
- priv->id, TRUE,
- NULL, NULL, NULL, NULL);
- g_object_unref (connection);
- g_object_unref (mc);
+ switch (priv->handle_type) {
+ case TP_HANDLE_TYPE_CONTACT:
+ empathy_dispatcher_chat_with_contact_id (
+ connection, priv->id,
+ chat_connect_channel_reconnected,
+ chat);
+ break;
+ case TP_HANDLE_TYPE_ROOM:
+ empathy_dispatcher_join_muc (connection,
+ priv->id,
+ chat_connect_channel_reconnected,
+ chat);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
}
}
EmpathyChatPriv *priv;
EmpathyMessage *message;
- priv = GET_PRIV (chat);
-
- if (G_STR_EMPTY (msg)) {
+ if (EMP_STR_EMPTY (msg)) {
return;
}
+ priv = GET_PRIV (chat);
+
chat_sent_message_add (chat, msg);
if (g_str_has_prefix (msg, "/clear")) {
return;
}
- message = empathy_message_new (msg);
+ /* Blacklist messages begining by '/', except for "/me" and "/say"
+ * because they are handled in EmpathyMessage */
+ if (msg[0] == '/' &&
+ !g_str_has_prefix (msg, "/me") &&
+ !g_str_has_prefix (msg, "/say")) {
+ empathy_chat_view_append_event (chat->view,
+ _("Unsupported command"));
+ return;
+ }
+ /* We can send the message */
+ message = empathy_message_new (msg);
empathy_tp_chat_send (priv->tp_chat, message);
-
g_object_unref (message);
}
}
static void
-chat_message_received_cb (EmpathyTpChat *tp_chat,
- EmpathyMessage *message,
- EmpathyChat *chat)
+chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
EmpathyContact *sender;
empathy_contact_get_name (sender),
empathy_contact_get_handle (sender));
- if (priv->id) {
- gboolean is_chatroom;
-
- is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM;
- empathy_log_manager_add_message (priv->log_manager,
- priv->id, is_chatroom,
- message);
- }
-
empathy_chat_view_append_message (chat->view, message);
- /* We received a message so the contact is no more composing */
- chat_state_changed_cb (tp_chat, sender,
+ /* We received a message so the contact is no longer composing */
+ chat_state_changed_cb (priv->tp_chat, sender,
TP_CHANNEL_CHAT_STATE_ACTIVE,
chat);
g_signal_emit (chat, signals[NEW_MESSAGE], 0, message);
}
+static void
+chat_message_received_cb (EmpathyTpChat *tp_chat,
+ EmpathyMessage *message,
+ EmpathyChat *chat)
+{
+ chat_message_received (chat, message);
+ empathy_tp_chat_acknowledge_message (tp_chat, message);
+}
+
static void
chat_send_error_cb (EmpathyTpChat *tp_chat,
EmpathyMessage *message,
priv->subject = g_value_dup_string (value);
g_object_notify (G_OBJECT (chat), "subject");
- if (G_STR_EMPTY (priv->subject)) {
+ if (EMP_STR_EMPTY (priv->subject)) {
gtk_widget_hide (priv->hbox_topic);
} else {
gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->subject);
if (priv->block_events_timeout_id == 0) {
gchar *str;
- if (!G_STR_EMPTY (priv->subject)) {
+ if (!EMP_STR_EMPTY (priv->subject)) {
str = g_strdup_printf (_("Topic set to: %s"), priv->subject);
} else {
str = g_strdup (_("No topic defined"));
}
}
-static gboolean
-chat_get_is_command (const gchar *str)
-{
- g_return_val_if_fail (str != NULL, FALSE);
-
- if (str[0] != '/') {
- return FALSE;
- }
-
- if (g_str_has_prefix (str, "/me")) {
- return TRUE;
- }
- else if (g_str_has_prefix (str, "/nick")) {
- return TRUE;
- }
- else if (g_str_has_prefix (str, "/topic")) {
- return TRUE;
- }
-
- return FALSE;
-}
-
static void
chat_input_text_buffer_changed_cb (GtkTextBuffer *buffer,
EmpathyChat *chat)
str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
- /* spell check string */
- if (!chat_get_is_command (str)) {
+ /* spell check string if not a command */
+ if (str[0] != '/') {
correct = empathy_spell_check (str);
} else {
correct = TRUE;
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- smiley_manager = empathy_smiley_manager_new ();
+ smiley_manager = empathy_smiley_manager_dup_singleton ();
smiley_menu = empathy_smiley_menu_new (smiley_manager,
chat_insert_smiley_activate_cb,
chat);
/* Add the Send menu item. */
gtk_text_buffer_get_bounds (buffer, &start, &end);
str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
- if (!G_STR_EMPTY (str)) {
+ if (!EMP_STR_EMPTY (str)) {
item = gtk_menu_item_new_with_mnemonic (_("_Send"));
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (chat_text_send_cb), chat);
str = gtk_text_buffer_get_text (buffer,
&start, &end, FALSE);
}
- if (!G_STR_EMPTY (str)) {
+ if (!EMP_STR_EMPTY (str)) {
chat_spell = chat_spell_new (chat, str, start, end);
g_object_set_data_full (G_OBJECT (menu),
"chat_spell", chat_spell,
}
}
+static gboolean
+chat_log_filter (EmpathyMessage *message,
+ gpointer user_data)
+{
+ EmpathyChat *chat = (EmpathyChat *) user_data;
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ const GList *pending;
+
+ pending = empathy_tp_chat_get_pending_messages (priv->tp_chat);
+
+ for (; pending; pending = g_list_next (pending)) {
+ if (empathy_message_equal (message, pending->data)) {
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
static void
chat_add_logs (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
gboolean is_chatroom;
GList *messages, *l;
- guint num_messages;
- guint i;
if (!priv->id) {
return;
/* Add messages from last conversation */
is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM;
- messages = empathy_log_manager_get_last_messages (priv->log_manager,
- priv->account,
- priv->id,
- is_chatroom);
- num_messages = g_list_length (messages);
-
- /* Only keep the 10 last messages */
- for (i = 0; num_messages - i > 10; i++) {
- EmpathyMessage *message;
-
- message = messages->data;
- messages = g_list_remove (messages, message);
- g_object_unref (message);
- }
- for (l = messages; l; l = l->next) {
+ messages = empathy_log_manager_get_filtered_messages (priv->log_manager,
+ priv->account,
+ priv->id,
+ is_chatroom,
+ 5,
+ chat_log_filter,
+ chat);
+
+ for (l = messages; l; l = g_list_next (l)) {
empathy_chat_view_append_message (chat->view, l->data);
g_object_unref (l->data);
}
+
g_list_free (messages);
/* Turn back on scrolling */
if (priv->block_events_timeout_id == 0) {
gchar *str;
- empathy_contact_run_until_ready (contact,
- EMPATHY_CONTACT_READY_NAME,
- NULL);
-
if (is_member) {
str = g_strdup_printf (_("%s has joined the room"),
empathy_contact_get_name (contact));
return;
}
+ chat_composing_remove_timeout (chat);
g_object_unref (priv->tp_chat);
priv->tp_chat = NULL;
g_object_notify (G_OBJECT (chat), "tp-chat");
chat_set_show_contacts (chat, FALSE);
}
+static void
+show_pending_messages (EmpathyChat *chat) {
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ const GList *messages, *l;
+
+ if (chat->view == NULL || priv->tp_chat == NULL)
+ return;
+
+ messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
+
+ for (l = messages; l != NULL ; l = g_list_next (l)) {
+ EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
+ chat_message_received (chat, message);
+ }
+ empathy_tp_chat_acknowledge_messages (priv->tp_chat, messages);
+}
+
static void
chat_create_ui (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- GladeXML *glade;
+ GtkBuilder *gui;
GList *list = NULL;
gchar *filename;
GtkTextBuffer *buffer;
- filename = empathy_file_lookup ("empathy-chat.glade",
+ filename = empathy_file_lookup ("empathy-chat.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "chat_widget",
- NULL,
+ gui = empathy_builder_get_file (filename,
"chat_widget", &priv->widget,
"hpaned", &priv->hpaned,
"vbox_left", &priv->vbox_left,
"scrolled_window_contacts", &priv->scrolled_window_contacts,
NULL);
g_free (filename);
- g_object_unref (glade);
/* Add message view. */
chat->view = empathy_theme_manager_create_view (empathy_theme_manager_get ());
/* Add the main widget in the chat widget */
gtk_container_add (GTK_CONTAINER (chat), priv->widget);
+ g_object_unref (gui);
}
static void
chat_composing_remove_timeout (chat);
g_signal_handlers_disconnect_by_func (priv->account_manager,
- chat_connection_changed_cb, object);
+ chat_new_connection_cb, object);
g_object_unref (priv->account_manager);
g_object_unref (priv->log_manager);
if (priv->tp_chat) {
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_destroy_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_message_received_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_send_error_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_state_changed_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_property_changed_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_members_changed_cb, chat);
+ g_signal_handlers_disconnect_by_func (priv->tp_chat,
+ chat_remote_contact_changed_cb, chat);
+ empathy_tp_chat_close (priv->tp_chat);
g_object_unref (priv->tp_chat);
}
if (priv->account) {
g_free (priv->id);
g_free (priv->name);
g_free (priv->subject);
+ g_completion_free (priv->completion);
G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object);
}
chat_create_ui (chat);
chat_add_logs (chat);
+ show_pending_messages (chat);
}
static void
EMPATHY_TYPE_CHAT, EmpathyChatPriv);
chat->priv = priv;
- priv->log_manager = empathy_log_manager_new ();
+ priv->log_manager = empathy_log_manager_dup_singleton ();
priv->contacts_width = -1;
priv->sent_messages = NULL;
priv->sent_messages_index = -1;
priv->account_manager = empathy_account_manager_dup_singleton ();
g_signal_connect (priv->account_manager,
- "account-connection-changed",
- G_CALLBACK (chat_connection_changed_cb),
+ "new-connection",
+ G_CALLBACK (chat_new_connection_cb),
chat);
/* Block events for some time to avoid having "has come online" or
EmpathyTpChat *tp_chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
+ TpConnection *connection;
g_return_if_fail (EMPATHY_IS_CHAT (chat));
g_return_if_fail (EMPATHY_IS_TP_CHAT (tp_chat));
}
priv->tp_chat = g_object_ref (tp_chat);
- priv->account = g_object_ref (empathy_tp_chat_get_account (tp_chat));
+ connection = empathy_tp_chat_get_connection (priv->tp_chat);
+ priv->account = empathy_account_manager_get_account (priv->account_manager,
+ connection);
+ g_object_ref (priv->account);
+ g_signal_connect (tp_chat, "destroy",
+ G_CALLBACK (chat_destroy_cb),
+ chat);
g_signal_connect (tp_chat, "message-received",
G_CALLBACK (chat_message_received_cb),
chat);
g_signal_connect_swapped (tp_chat, "notify::remote-contact",
G_CALLBACK (chat_remote_contact_changed_cb),
chat);
- g_signal_connect (tp_chat, "destroy",
- G_CALLBACK (chat_destroy_cb),
- chat);
chat_remote_contact_changed_cb (chat);
}
}
- empathy_tp_chat_set_acknowledge (priv->tp_chat, TRUE);
- empathy_tp_chat_emit_pendings (priv->tp_chat);
-
g_object_notify (G_OBJECT (chat), "tp-chat");
g_object_notify (G_OBJECT (chat), "id");
g_object_notify (G_OBJECT (chat), "account");
+
+ /* This is a noop when tp-chat is set at object construction time and causes
+ * the pending messages to be show when it's set on the object after it has
+ * been created */
+ show_pending_messages (chat);
}
McAccount *
return priv->remote_contact;
}
-guint
-empathy_chat_get_members_count (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
-
- g_return_val_if_fail (EMPATHY_IS_CHAT (chat), 0);
-
- if (priv->tp_chat) {
- return empathy_tp_chat_get_members_count (priv->tp_chat);
- }
-
- return 0;
-}
-
GtkWidget *
empathy_chat_get_contact_menu (EmpathyChat *chat)
{
projects / empathy.git / blobdiff