#include "empathy-chat.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-client-factory.h"
#include "empathy-gsettings.h"
#include "empathy-individual-store-channel.h"
#include "empathy-individual-view.h"
#include "empathy-input-text-view.h"
-#include "empathy-keyring.h"
#include "empathy-request-util.h"
#include "empathy-search-bar.h"
-#include "empathy-smiley-manager.h"
#include "empathy-spell.h"
#include "empathy-string-parser.h"
#include "empathy-theme-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
-#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
#include "empathy-debug.h"
guint unread_messages;
guint unread_messages_when_offline;
- /* TRUE if the pending messages can be displayed. This is to avoid to show
- * pending messages *before* messages from logs. (#603980) */
- gboolean can_show_pending;
/* FIXME: retrieving_backlogs flag is a workaround for Bug#610994 and should
* be differently handled since it introduces another race condition, which
if (priv->tp_chat != NULL || account != priv->account ||
priv->handle_type == TP_HANDLE_TYPE_NONE ||
- EMP_STR_EMPTY (priv->id))
+ TPAW_STR_EMPTY (priv->id))
return;
g_object_ref (chat);
goto OUT;
}
- if (!EMP_STR_EMPTY (data->message) && TP_IS_TEXT_CHANNEL (channel)) {
+ if (!TPAW_STR_EMPTY (data->message) && TP_IS_TEXT_CHANNEL (channel)) {
TpTextChannel *text = (TpTextChannel *) channel;
TpMessage *msg;
connection = tp_channel_get_connection (TP_CHANNEL (priv->tp_chat));
return tp_proxy_has_interface_by_id (connection,
- EMP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING);
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING);
}
static gboolean
* https://bugs.freedesktop.org/show_bug.cgi?id=13422 */
while (rooms[i] != NULL) {
/* ignore empty strings */
- if (!EMP_STR_EMPTY (rooms[i])) {
+ if (!TPAW_STR_EMPTY (rooms[i])) {
empathy_chat_join_muc (chat, rooms[i]);
}
i++;
EmpathyChatPriv *priv = GET_PRIV (chat);
ChatCommandMsgData *data;
TpAccountChannelRequest *req;
- GHashTable *request;
- request = tp_asv_new (
- TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
- TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, contact_id,
- NULL);
-
- req = tp_account_channel_request_new (priv->account, request,
+ req = tp_account_channel_request_new_text (priv->account,
empathy_get_current_action_time ());
+ tp_account_channel_request_set_target_id (req, TP_HANDLE_TYPE_CONTACT,
+ contact_id);
+
/* FIXME: We should probably search in members alias. But this
* is enough for IRC */
data = g_slice_new (ChatCommandMsgData);
data->message = g_strdup (message);
tp_account_channel_request_ensure_and_observe_channel_async (req,
- EMPATHY_CHAT_BUS_NAME, NULL, chat_command_msg_cb, data);
+ EMPATHY_CHAT_TP_BUS_NAME, NULL, chat_command_msg_cb, data);
g_object_unref (req);
- g_hash_table_unref (request);
}
static void
}
static void
-callback_for_request_rename (TpProxy *proxy,
+callback_for_request_rename (TpConnection *conn,
const GError *error,
gpointer user_data,
GObject *weak_object)
GStrv strv)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- TpProxy *proxy;
+ TpConnection *conn;
- proxy = TP_PROXY (tp_account_get_connection (priv->account));
+ conn = tp_account_get_connection (priv->account);
- emp_cli_connection_interface_renaming_call_request_rename (proxy, -1,
+ tp_cli_connection_interface_renaming_call_request_rename (conn, -1,
strv[1], callback_for_request_rename, NULL, NULL, NULL);
}
/* Append last part if not empty */
item = g_strstrip (g_strdup (text));
- if (!EMP_STR_EMPTY (item)) {
+ if (!TPAW_STR_EMPTY (item)) {
g_ptr_array_add (array, item);
DEBUG ("\tITEM: \"%s\"", item);
} else {
TpMessage *message;
guint i;
- if (EMP_STR_EMPTY (msg)) {
+ if (TPAW_STR_EMPTY (msg)) {
return;
}
{
EmpathyChatPriv *priv = GET_PRIV (chat);
const gchar *msg;
- TpChannelTextMessageFlags flags;
g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
return FALSE;
}
- flags = empathy_message_get_flags (message);
- if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) {
+ if (empathy_message_is_backlog (message)) {
/* FIXME: Ideally we shouldn't highlight scrollback messages only if they
* have already been received by the user before (and so are in the logs) */
return FALSE;
priv->subject = g_strdup (empathy_tp_chat_get_subject (priv->tp_chat));
g_object_notify (G_OBJECT (chat), "subject");
- if (EMP_STR_EMPTY (priv->subject)) {
+ if (TPAW_STR_EMPTY (priv->subject)) {
gtk_widget_hide (priv->hbox_topic);
} else {
gchar *markup_topic;
gchar *markup_text;
- markup_topic = empathy_add_link_markup (priv->subject);
+ markup_topic = tpaw_add_link_markup (priv->subject);
markup_text = g_strdup_printf ("<span weight=\"bold\">%s</span> %s",
_("Topic:"), markup_topic);
if (priv->block_events_timeout_id == 0) {
gchar *str = NULL;
- if (!EMP_STR_EMPTY (priv->subject)) {
+ if (!TPAW_STR_EMPTY (priv->subject)) {
const gchar *actor = empathy_tp_chat_get_subject_actor (priv->tp_chat);
if (tp_str_empty (actor)) {
empathy_theme_adium_focus_toggled (chat->view, gtk_widget_has_focus (widget));
}
+void
+empathy_chat_insert_smiley (GtkTextBuffer *buffer,
+ EmpathySmiley *smiley)
+{
+ gtk_text_buffer_insert_at_cursor (buffer, smiley->str, -1);
+}
+
static void
chat_insert_smiley_activate_cb (EmpathySmileyManager *manager,
EmpathySmiley *smiley,
{
EmpathyChat *chat = EMPATHY_CHAT (user_data);
GtkTextBuffer *buffer;
- GtkTextIter iter;
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
- gtk_text_buffer_get_end_iter (buffer, &iter);
- gtk_text_buffer_insert (buffer, &iter, smiley->str, -1);
-
- gtk_text_buffer_get_end_iter (buffer, &iter);
- gtk_text_buffer_insert (buffer, &iter, " ", -1);
+ empathy_chat_insert_smiley (buffer, smiley);
}
typedef struct {
/* Add the Send menu item. */
gtk_text_buffer_get_bounds (buffer, &start, &end);
str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
- if (!EMP_STR_EMPTY (str)) {
+ if (!TPAW_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 (!EMP_STR_EMPTY (str)) {
+ if (!TPAW_STR_EMPTY (str)) {
chat_spell = chat_spell_new (chat, str, start, end);
g_object_set_data_full (G_OBJECT (menu),
"chat-spell", chat_spell,
return retval;
}
-
static void
show_pending_messages (EmpathyChat *chat) {
EmpathyChatPriv *priv = GET_PRIV (chat);
const GList *messages, *l;
g_return_if_fail (EMPATHY_IS_CHAT (chat));
-
- if (chat->view == NULL || priv->tp_chat == NULL)
- return;
-
- if (!priv->can_show_pending)
- return;
+ g_return_if_fail (chat->view != NULL);
+ g_return_if_fail (priv->tp_chat != NULL);
messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
}
}
-
static gboolean
chat_scrollable_set_value (gpointer user_data)
{
*/
if (G_UNLIKELY (!priv->watch_scroll &&
!tpl_log_walker_is_end (priv->log_walker))) {
- /* The pending messages need not be shown after the
- * first batch of logs have been displayed */
- priv->can_show_pending = TRUE;
- show_pending_messages (chat);
-
priv->watch_scroll = TRUE;
g_idle_add_full (G_PRIORITY_LOW, chat_scrollable_connect,
g_object_ref (chat), g_object_unref);
g_string_append_printf (s, _("%s has left the room"), name);
}
- if (!EMP_STR_EMPTY (message)) {
+ if (!TPAW_STR_EMPTY (message)) {
/* Note to translators: this string is appended to
* notifications like "foo has left the room", with the message
* given by the user living the room. If this poses a problem,
filename = empathy_file_lookup ("empathy-chat.ui",
"libempathy-gtk");
- gui = empathy_builder_get_file (filename,
+ gui = tpaw_builder_get_file (filename,
"chat_widget", &priv->widget,
"hpaned", &priv->hpaned,
"vbox_left", &priv->vbox_left,
"info_bar_vbox", &priv->info_bar_vbox,
NULL);
- empathy_builder_connect (gui, chat,
+ tpaw_builder_connect (gui, chat,
"expander_topic", "notify::expanded", chat_topic_expander_activate_cb,
"label_topic", "size-allocate", chat_topic_label_size_allocate_cb,
NULL);
supports_avatars);
}
- /* Add messages from last conversation */
+ /* Add messages from last conversations. Backlog messages are always
+ * prepended and pending messages are appended, so we can do both
+ * independently. Hacks like we previously had for bug #603980 are no
+ * longer needed. Pending messages are handled within
+ * empathy_chat_set_tp_chat() so we don't have to care about them here.
+ */
if (priv->handle_type == TP_HANDLE_TYPE_ROOM)
target = tpl_entity_new_from_room_id (priv->id);
else
g_object_unref (target);
if (priv->handle_type != TP_HANDLE_TYPE_ROOM) {
- /* First display logs from the logger and then display pending messages */
chat_add_logs (chat);
}
- else {
- /* Just display pending messages for rooms */
- priv->can_show_pending = TRUE;
- show_pending_messages (chat);
- }
}
static void
priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_alias);
g_completion_set_compare (priv->completion, chat_contacts_completion_func);
+ /* Create UI early so by the time empathy_chat_set_tp_chat() is called
+ * (construct property) the view will already exists to receive pending
+ * messages. */
chat_create_ui (chat);
}
if (response_id == GTK_RESPONSE_OK) {
DEBUG ("Saving room password");
- empathy_keyring_set_room_password_async (priv->account,
+ tpaw_keyring_set_room_password_async (priv->account,
empathy_tp_chat_get_id (priv->tp_chat),
data->password,
NULL, NULL);
str = gtk_entry_get_text (GTK_ENTRY (entry));
gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+ GTK_ENTRY_ICON_SECONDARY, !TPAW_STR_EMPTY (str));
}
static void
const gchar *password;
GError *error = NULL;
- password = empathy_keyring_get_room_password_finish (priv->account,
+ password = tpaw_keyring_get_room_password_finish (priv->account,
result, &error);
if (error != NULL) {
EmpathyChatPriv *priv = GET_PRIV (self);
if (tp_channel_password_needed (TP_CHANNEL (priv->tp_chat))) {
- empathy_keyring_get_room_password_async (priv->account,
+ tpaw_keyring_get_room_password_async (priv->account,
empathy_tp_chat_get_id (priv->tp_chat),
chat_room_got_password_cb, self);
}
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);
/* check if a password is needed */
if (individual == NULL)
return NULL;
- menu = empathy_individual_menu_new (individual,
+ menu = empathy_individual_menu_new (individual, NULL,
EMPATHY_INDIVIDUAL_FEATURE_CALL |
EMPATHY_INDIVIDUAL_FEATURE_LOG |
EMPATHY_INDIVIDUAL_FEATURE_INFO |
projects / empathy.git / blobdiff