*/
#include "config.h"
-
-#include <string.h>
+#include "empathy-message.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-
-#include <telepathy-logger/entity.h>
-#include <telepathy-logger/event.h>
-#include <telepathy-logger/text-event.h>
-#ifdef HAVE_CALL_LOGS
-# include <telepathy-logger/call-event.h>
-#endif
-
-#include "empathy-message.h"
+#include "empathy-client-factory.h"
#include "empathy-utils.h"
#include "empathy-enum-types.h"
gboolean is_backlog;
guint id;
gboolean incoming;
- TpChannelTextMessageFlags flags;
} EmpathyMessagePriv;
static void empathy_message_finalize (GObject *object);
PROP_ORIGINAL_TIMESTAMP,
PROP_IS_BACKLOG,
PROP_INCOMING,
- PROP_FLAGS,
PROP_TP_MESSAGE,
};
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property (object_class,
- PROP_FLAGS,
- g_param_spec_uint ("flags",
- "Flags",
- "The TpChannelTextMessageFlags of this message",
- 0, G_MAXUINT, 0,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
- G_PARAM_CONSTRUCT_ONLY));
-
g_object_class_install_property (object_class,
PROP_TP_MESSAGE,
g_param_spec_object ("tp-message",
EMPATHY_TYPE_MESSAGE, EmpathyMessagePriv);
message->priv = priv;
- priv->timestamp = empathy_time_get_current ();
+ priv->timestamp = tpaw_time_get_current ();
}
static void
case PROP_INCOMING:
g_value_set_boolean (value, priv->incoming);
break;
- case PROP_FLAGS:
- g_value_set_uint (value, priv->flags);
- break;
case PROP_TP_MESSAGE:
g_value_set_object (value, priv->tp_message);
break;
case PROP_TIMESTAMP:
priv->timestamp = g_value_get_int64 (value);
if (priv->timestamp <= 0)
- priv->timestamp = empathy_time_get_current ();
+ priv->timestamp = tpaw_time_get_current ();
break;
case PROP_ORIGINAL_TIMESTAMP:
priv->original_timestamp = g_value_get_int64 (value);
case PROP_INCOMING:
priv->incoming = g_value_get_boolean (value);
break;
- case PROP_FLAGS:
- priv->flags = g_value_get_uint (value);
- break;
case PROP_TP_MESSAGE:
priv->tp_message = g_value_dup_object (value);
break;
empathy_message_from_tpl_log_event (TplEvent *logevent)
{
EmpathyMessage *retval = NULL;
- TpAccountManager *acc_man = NULL;
+ EmpathyClientFactory *factory;
TpAccount *account = NULL;
TplEntity *receiver = NULL;
TplEntity *sender = NULL;
g_return_val_if_fail (TPL_IS_EVENT (logevent), NULL);
- acc_man = tp_account_manager_dup ();
+ factory = empathy_client_factory_dup ();
/* FIXME Currently Empathy shows in the log viewer only valid accounts, so it
* won't be selected any non-existing (ie removed) account.
* When #610455 will be fixed, calling tp_account_manager_ensure_account ()
* If the way EmpathyContact stores the avatar is changes, it might not be
* needed anymore any TpAccount passing and the following call will be
* useless */
- account = tp_account_manager_ensure_account (acc_man,
- tpl_event_get_account_path (logevent));
- g_object_unref (acc_man);
+ account = tp_simple_client_factory_ensure_account (
+ TP_SIMPLE_CLIENT_FACTORY (factory),
+ tpl_event_get_account_path (logevent), NULL, NULL);
+ g_object_unref (factory);
if (TPL_IS_TEXT_EVENT (logevent)) {
TplTextEvent *textevent = TPL_TEXT_EVENT (logevent);
type = tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent));
token = tpl_text_event_get_message_token (textevent);
}
-#ifdef HAVE_CALL_LOGS
else if (TPL_IS_CALL_EVENT (logevent)) {
TplCallEvent *call = TPL_CALL_EVENT (logevent);
timestamp = tpl_event_get_timestamp (logevent);
- if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER)
+ if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
body = g_strdup_printf (_("Missed call from %s"),
tpl_entity_get_alias (tpl_event_get_sender (logevent)));
else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
body = g_strdup_printf (_("Call from %s"),
tpl_entity_get_alias (tpl_event_get_sender (logevent)));
}
-#endif
else {
/* Unknown event type */
return NULL;
return priv->is_backlog;
}
-#define IS_SEPARATOR(ch) (ch == ' ' || ch == ',' || ch == '.' || ch == ':')
-gboolean
-empathy_message_should_highlight (EmpathyMessage *message)
-{
- EmpathyContact *contact;
- const gchar *msg, *to;
- gchar *cf_msg, *cf_to;
- gchar *ch;
- gboolean ret_val;
- TpChannelTextMessageFlags flags;
-
- g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
- ret_val = FALSE;
-
- msg = empathy_message_get_body (message);
- if (!msg) {
- return FALSE;
- }
-
- contact = empathy_message_get_receiver (message);
- if (!contact || !empathy_contact_is_user (contact)) {
- return FALSE;
- }
-
- to = empathy_contact_get_alias (contact);
- if (!to) {
- return FALSE;
- }
-
- flags = empathy_message_get_flags (message);
- if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) {
- /* 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;
- }
-
- cf_msg = g_utf8_casefold (msg, -1);
- cf_to = g_utf8_casefold (to, -1);
-
- ch = strstr (cf_msg, cf_to);
- if (ch == NULL) {
- goto finished;
- }
- if (ch != cf_msg) {
- /* Not first in the message */
- if (!IS_SEPARATOR (*(ch - 1))) {
- goto finished;
- }
- }
-
- ch = ch + strlen (cf_to);
- if (ch >= cf_msg + strlen (cf_msg)) {
- ret_val = TRUE;
- goto finished;
- }
-
- if (IS_SEPARATOR (*ch)) {
- ret_val = TRUE;
- goto finished;
- }
-
-finished:
- g_free (cf_msg);
- g_free (cf_to);
-
- return ret_val;
-}
-
TpChannelTextMessageType
empathy_message_type_from_str (const gchar *type_str)
{
return FALSE;
}
-TpChannelTextMessageFlags
-empathy_message_get_flags (EmpathyMessage *self)
-{
- EmpathyMessagePriv *priv = GET_PRIV (self);
-
- g_return_val_if_fail (EMPATHY_IS_MESSAGE (self), 0);
-
- return priv->flags;
-}
-
EmpathyMessage *
empathy_message_new_from_tp_message (TpMessage *tp_msg,
gboolean incoming)
{
EmpathyMessage *message;
gchar *body;
- TpChannelTextMessageFlags flags;
gint64 timestamp;
gint64 original_timestamp;
const GHashTable *part = tp_message_peek (tp_msg, 0);
- gboolean is_backlog;
g_return_val_if_fail (TP_IS_MESSAGE (tp_msg), NULL);
- body = tp_message_to_text (tp_msg, &flags);
+ body = tp_message_to_text (tp_msg, NULL);
timestamp = tp_message_get_sent_timestamp (tp_msg);
if (timestamp == 0)
original_timestamp = tp_asv_get_int64 (part,
"original-message-received", NULL);
- is_backlog = (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) ==
- TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK;
-
message = g_object_new (EMPATHY_TYPE_MESSAGE,
"body", body,
"token", tp_message_get_token (tp_msg),
"type", tp_message_get_message_type (tp_msg),
"timestamp", timestamp,
"original-timestamp", original_timestamp,
- "flags", flags,
- "is-backlog", is_backlog,
+ "is-backlog", tp_message_is_scrollback (tp_msg),
"incoming", incoming,
"tp-message", tp_msg,
NULL);
projects / empathy.git / blobdiff